Merge "Add dynamic summaries to Slices"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fe3b792..51a811d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -242,13 +242,6 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".search.SearchActivity"
-                  android:label="@string/search_settings"
-                  android:icon="@drawable/ic_search_24dp"
-                  android:parentActivityName="Settings"
-                  android:theme="@style/Theme.Settings.NoActionBar">
-        </activity>
-
         <activity android:name=".search.SearchResultTrampoline"
                   android:theme="@android:style/Theme.NoDisplay"
                   android:excludeFromRecents="true"
@@ -1206,7 +1199,6 @@
         </activity>
 
         <activity android:name="Settings$NotificationStationActivity"
-                android:theme="@style/Theme.NotificationStation"
                 android:label="@string/notification_log_title"
                 android:taskAffinity="">
             <intent-filter>
diff --git a/res/drawable/ic_perm_device_information_green_24dp.xml b/res/drawable/ic_perm_device_information_green_24dp.xml
new file mode 100644
index 0000000..a2b9354
--- /dev/null
+++ b/res/drawable/ic_perm_device_information_green_24dp.xml
@@ -0,0 +1,26 @@
+<!--
+    Copyright (C) 2018 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#0F9D58"
+        android:pathData="M13,7h-2v2h2L13,7zM13,11h-2v6h2v-6zM17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,
+        1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14z"/>
+</vector>
diff --git a/res/drawable/ic_suggestion_close_button.xml b/res/drawable/ic_suggestion_close_button.xml
new file mode 100644
index 0000000..615b215
--- /dev/null
+++ b/res/drawable/ic_suggestion_close_button.xml
@@ -0,0 +1,25 @@
+<!--
+     Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18.3,5.71a0.996,0.996 0,0 0,-1.41 0L12,10.59 7.11,5.7A0.996,0.996 0,1 0,5.7 7.11L10.59,12 5.7,16.89a0.996,0.996 0,1 0,1.41 1.41L12,13.41l4.89,4.89a0.996,0.996 0,1 0,1.41 -1.41L13.41,12l4.89,-4.89c0.38,-0.38 0.38,-1.02 0,-1.4z"/>
+</vector>
diff --git a/res/layout-sw320dp/settings_entity_header.xml b/res/layout-sw320dp/settings_entity_header.xml
index 951961c..481a9c4 100644
--- a/res/layout-sw320dp/settings_entity_header.xml
+++ b/res/layout-sw320dp/settings_entity_header.xml
@@ -45,6 +45,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
             android:orientation="vertical">
@@ -57,8 +58,7 @@
                 android:singleLine="false"
                 android:ellipsize="marquee"
                 android:gravity="start"
-                android:textDirection="locale"
-                android:paddingTop="8dp" />
+                android:textDirection="locale" />
 
             <TextView
                 android:id="@+id/install_type"
diff --git a/res/layout/condition_container.xml b/res/layout/condition_container.xml
new file mode 100644
index 0000000..808c4ac
--- /dev/null
+++ b/res/layout/condition_container.xml
@@ -0,0 +1,44 @@
+<?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.
+-->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="@style/SuggestionConditionStyle"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="16dp"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
+    android:paddingBottom="@dimen/dashboard_padding_bottom">
+
+    <android.support.v7.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:cardUseCompatPadding="true"
+        app:cardElevation="2dp">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/data"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/material_grey_300"
+            android:scrollbars="none"/>
+
+    </android.support.v7.widget.CardView>
+
+</FrameLayout>
diff --git a/res/layout/running_processes_header.xml b/res/layout/running_processes_header.xml
index aa106ac..ac31543 100644
--- a/res/layout/running_processes_header.xml
+++ b/res/layout/running_processes_header.xml
@@ -36,7 +36,7 @@
         android:gravity="left|center_vertical"
         android:text="@string/running_processes_header_title" />
 
-    <view class="com.android.settings.applications.LinearColorBar"
+    <view class="com.android.settings.widget.LinearColorBar"
         android:id="@+id/color_bar"
         android:layout_width="match_parent"
         android:layout_height="16sp"
diff --git a/res/layout/settings_summary_preference.xml b/res/layout/settings_summary_preference.xml
index 7d550b5..1340571 100644
--- a/res/layout/settings_summary_preference.xml
+++ b/res/layout/settings_summary_preference.xml
@@ -42,7 +42,7 @@
         android:paddingBottom="5dp"
         android:maxLines="10" />
 
-    <com.android.settings.applications.LinearColorBar
+    <com.android.settings.widget.LinearColorBar
         android:id="@+id/color_bar"
         android:layout_width="match_parent"
         android:layout_height="28dp"
diff --git a/res/layout/suggestion_container.xml b/res/layout/suggestion_container.xml
new file mode 100644
index 0000000..2aa1043
--- /dev/null
+++ b/res/layout/suggestion_container.xml
@@ -0,0 +1,64 @@
+<?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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/SuggestionConditionStyle"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="20dp"
+    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="20dp"
+        android:paddingBottom="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:scrollbars="none"/>
+
+</LinearLayout>
diff --git a/res/layout/suggestion_tile_v2.xml b/res/layout/suggestion_tile_v2.xml
new file mode 100644
index 0000000..e180897
--- /dev/null
+++ b/res/layout/suggestion_tile_v2.xml
@@ -0,0 +1,77 @@
+<?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.
+-->
+
+<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="328dp"
+    android:layout_height="wrap_content"
+    app:cardUseCompatPadding="true"
+    app:cardElevation="2dp">
+
+    <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/dashboard_tile_image_size"
+                android:layout_height="@dimen/dashboard_tile_image_size"
+                android:layout_centerHorizontal = "true"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="8dp" />
+
+            <ImageView
+                android:id="@+id/close_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="8dp"
+                android:src="@drawable/ic_suggestion_close_button"/>
+
+        </RelativeLayout>
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:singleLine="true"
+            android:layout_marginLeft="12dp"
+            android:layout_marginRight="12dp"
+            android:textAppearance="@style/TextAppearance.TileTitle"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:textAppearance="@style/TextAppearance.SuggestionSummary" />
+
+    </LinearLayout>
+
+</android.support.v7.widget.CardView>
diff --git a/res/layout/suggestion_tile_with_button_v2.xml b/res/layout/suggestion_tile_with_button_v2.xml
new file mode 100644
index 0000000..01be236
--- /dev/null
+++ b/res/layout/suggestion_tile_with_button_v2.xml
@@ -0,0 +1,84 @@
+<?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.
+-->
+
+<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="328dp"
+    android:layout_height="wrap_content"
+    app:cardUseCompatPadding="true"
+    app:cardElevation="2dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="112dp"
+        android:orientation="vertical"
+        android:background="@android:color/white">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@android:id/icon"
+                android:layout_width="@dimen/dashboard_tile_image_size"
+                android:layout_height="@dimen/dashboard_tile_image_size"
+                android:layout_centerHorizontal = "true"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="8dp" />
+
+            <ImageView
+                android:id="@+id/close_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="8dp"
+                android:src="@drawable/ic_suggestion_close_button"/>
+
+        </RelativeLayout>
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.TileTitle"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:textAppearance="@style/TextAppearance.SuggestionSummary" />
+
+        <Button
+            android:id="@android:id/primary"
+            style="@style/ActionPrimaryButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/suggestion_button_text" />
+
+    </LinearLayout>
+
+</android.support.v7.widget.CardView>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index d1568f9..2c4aa75 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Дрэнная"</item>
     <item msgid="2042505933058940139">"Дрэнны"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"Старэйшыя за 60 дзён"</item>
     <item msgid="5692284879054004388">"Старэйшыя за 90 дзён"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"Выкарыстоўваць параметры сеткі"</item>
+    <item msgid="8745603368609022803">"Лімітная"</item>
+    <item msgid="2266114985518865625">"Безлімітная"</item>
+  </string-array>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index a13afcc..ae376a7 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -172,6 +172,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Вашы прылады"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Спалучыце новую прыладу"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"Дазволіць прыладзе спалучацца з прыладамі Bluetooth і падключацца да іх"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Адключыць унутрыпалосны празвон"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Не прайграваць карыстальніцкія рынгтоны на тэлефоне праз гарнітуры Bluetooth"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Зараз падключана"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"Захаваныя прылады"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"Дадаць прыладу"</string>
@@ -334,6 +336,16 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"Задаць дату"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Сартаваць па алфавіце"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Сартаваць па часавым поясе"</string>
+    <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+    <skip />
+    <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+    <skip />
+    <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+    <skip />
     <string name="date_picker_title" msgid="1338210036394128512">"Дата"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Час"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Аўтаматычная блакіроўка"</string>
@@ -352,6 +364,8 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Звесткi профiлю"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Уліковыя запісы"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Месцазнаходжанне"</string>
+    <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+    <skip />
     <string name="account_settings_title" msgid="626177544686329806">"Уліковыя запісы"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"Бяспека і месца"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шыфраванне і ўліковыя даныя"</string>
@@ -713,6 +727,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Як гучная сувязь"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Для музыкі і мультымедыя"</string>
     <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="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>
@@ -727,6 +743,8 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Назва"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 ГГц"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 ГГц"</string>
+    <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+    <skip />
     <string name="link_speed" msgid="8896664974117585555">"%1$d Мб/с"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> хоча ўключыць Wi-Fi"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> хоча адключыць Wi-Fi"</string>
@@ -744,6 +762,8 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Уключыць Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+    <skip />
     <string name="wifi_settings_category" msgid="8719175790520448014">"Налады Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Усталяванне бесправадных кропак доступу і кіраванне iмi"</string>
@@ -855,7 +875,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS даступная)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Калі ласка, увядзіце пароль сеткі"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"Сетка Wi‑Fi аператара"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"Падлучыцца праз <xliff:g id="NAME">%1%s</xliff:g>"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Падлучыцца праз <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Каб павысіць дакладнасць размяшчэння і для іншых мэтаў, <xliff:g id="APP_NAME">%1$s</xliff:g> хоча ўключыць сеткавае сканаванне, нават калі Wi-Fi выключаны.\n\nДазволіць для ўсіх прыкладанняў, якія патрабуецца адсканаваць?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Каб адключыць гэту наладу, перайдзіце да пункту «Пашыраныя» меню перапаўнення."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Дазволіць"</string>
@@ -933,10 +953,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Дыяпазон для пунктаў доступу"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Выкарыстоўвайце хот-спот для стварэння сеткі Wi‑Fi для іншых прылад. Хот-спот дае доступ да інтэрнэту праз падключэнне да мабільнай перадачы даных. Мабільны аператар можа спаганяць дадатковую плату."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Праграмы могуць ствараць хот-спот для абагульвання змесціва з прыладамі паблізу."</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Аўтаматычна выключыць хот-спот"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Хот-спот Wi‑Fi выключыцца, калі прылады непадключаныя"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Уключэнне кропкi доступу..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Выключэнне кропкi доступу..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"Сетка <xliff:g id="NETWORK_SSID">%1$s</xliff:g> актыўная"</string>
@@ -985,6 +1003,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"Экстранны адрас"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Выкарыстоўваецца як ваша месцазнаходжанне, калі вы робіце экстранны выклік праз Wi‑Fi"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Дадатковыя звесткі"</annotation>" аб функцыях Прыватнай DNS"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Экран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Гук"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Гучнасць"</string>
@@ -1335,6 +1354,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Вашая новая <xliff:g id="NAME">^1</xliff:g> працуе. \n\nКаб перамясціць фатаграфіі, файлы і даныя дадаткаў на гэту прыладу, перайдзіце ў меню Налады &gt; Памяць."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Перамясціце <xliff:g id="APP">^1</xliff:g>"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Перамяшчэнне дадатку <xliff:g id="APP">^1</xliff:g> і яго даных на <xliff:g id="NAME_0">^2</xliff:g> зойме ўсяго некалькі секунд. Вы не зможаце выкарыстоўваць гэты дадатак, пакуль перамяшчэнне не завершана. \n\nНе вымайце <xliff:g id="NAME_1">^2</xliff:g> падчас перамяшчэння."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Каб перамяшчаць даныя, трэба разблакіраваць карыстальніка <xliff:g id="APP">^1</xliff:g>."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Перамяшчэнне <xliff:g id="APP">^1</xliff:g>..."</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Не вымайце <xliff:g id="NAME">^1</xliff:g> падчас перамяшчэння. \n\nДадатак <xliff:g id="APP">^2</xliff:g> не будзе даступны на гэтай прыладзе, пакуль перамяшчэнне не завершана."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Адмяніць перамяшчэнне"</string>
@@ -1495,6 +1515,8 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"Крыніцы месцазнаходжання"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Аб планшэце"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Пра тэлефон"</string>
+    <!-- no translation found for about_settings (6717640957897546887) -->
+    <skip />
     <string name="about_settings" product="emulator" msgid="221313099578564438">"Пра імітаваную прыладу"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Прагледзець юрыдычную інфармацыю, стан, вэрсіі праграмнага забяспечання"</string>
     <string name="legal_information" msgid="5769301644270604095">"Юрыдычная інфармацыя"</string>
@@ -1602,6 +1624,8 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"Паказаць усе праграмы (<xliff:g id="COUNT">%1$d</xliff:g> шт.)"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Ваш планшэт і асабістыя даныя больш уразлівыя для нападаў невядомых праграм. Пры ўсталёўцы праграм з гэтай крыніцы вы згаджаецеся, што несяце адказнасць за любыя пашкоджанні планшэта ці страту даных, якія могуць адбыцца ў выніку выкарыстання гэтых праграм."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Ваш тэлефон і асабістыя даныя больш уразлівыя для нападаў невядомых праграм. Пры ўсталёўцы праграм з гэтай крыніцы вы згаджаецеся, што несяце адказнасць за любыя пашкоджанні тэлефона ці страту даных, якія могуць адбыцца ў выніку выкарыстання гэтых праграм."</string>
+    <!-- no translation found for install_all_warning (3648003301476423145) -->
+    <skip />
     <string name="advanced_settings" msgid="1777249286757067969">"Пашыраныя налады"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Уключыць дадатковыя параметры налад"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Звесткі пра праграмы"</string>
@@ -1903,6 +1927,12 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Можа паўплываць на прадукцыйнасць"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Націсканне пасля спынення руху указальніка"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Затрымка перад націсканнем"</string>
+    <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+    <skip />
+    <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+    <skip />
+    <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+    <skip />
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"УКЛЮЧАНА"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"АДКЛЮЧАНА"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Паказваць у Хуткіх наладах"</string>
@@ -2073,14 +2103,39 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Выводзіць прыладу з рэжыму сну ў фонавым рэжыме"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Запытвае месцазнаходжанне занадта часта"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> праграм паводзяць сябе незвычайна"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Акумулятар у добрым стане"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Праграмы працуюць нармальна"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Нізкая ёмістасць акумулятара"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Акумулятар не можа забяспечыць дастатковы тэрмін аўтаномнай працы"</string>
+    <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+    <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Тэлефонам шмат карысталіся"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Планшэтам шмат карысталіся"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Прыладай шмат карысталіся"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"З моманту апошняй поўнай зарадкі прыладай карысталіся каля <xliff:g id="HOUR">%1$s</xliff:g>"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Вы шмат працавалі з тэлефонам і выкарысталі значную частку зараду акумулятара. Акумулятар працуе нармальна.\n\n З моманту апошняй поўнай зарадкі вы карысталіся тэлефонам на працягу <xliff:g id="HOUR">%1$s</xliff:g>.\n\n Усяго выкарыстана:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Вы шмат працавалі на планшэце і выкарысталі значную частку зараду акумулятара. Акумулятар працуе нармальна.\n\n З моманту апошняй поўнай зарадкі вы карысталіся планшэтам на працягу <xliff:g id="HOUR">%1$s</xliff:g>.\n\n Усяго выкарыстана:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Вы шмат працавалі на прыладзе і выкарысталі значную частку зараду акумулятара. Акумулятар працуе нармальна.\n\n З моманту апошняй поўнай зарадкі вы карысталіся прыладай на працягу <xliff:g id="HOUR">%1$s</xliff:g>.\n\n Усяго выкарыстана:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"Інтэлектуальны менеджар акумулятара"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"Аўтаматычнае кіраванне акумулятарам"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"Аўтаматычная рэгуліроўка спажывання энергіі праграмамі ў залежнасці ад умоў выкарыстання"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"Праграмы, якія не працуюць у фонавым рэжыме"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="one">%1$d праграма</item>
+      <item quantity="few">%1$d праграмы</item>
+      <item quantity="many">%1$d праграм</item>
+      <item quantity="other">%1$d праграмы</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"Спыніць праграму?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Ваш тэлефон не можа нармальна кіраваць зарадам акумулятара, бо <xliff:g id="APP">%1$s</xliff:g> трымае тэлефон у актыўным рэжыме.\n\nВырашыць гэту праблему можна, прымусова спыніўшы праграму.\n\nКалі гэта не дапамагло, трэба выдаліць праграму, каб павысіць прадукцыйнасць акумулятара."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Ваш планшэт не можа нармальна кіраваць зарадам акумулятара, бо <xliff:g id="APP">%1$s</xliff:g> трымае планшэт у актыўным рэжыме.\n\nВырашыць гэту праблему можна, прымусова спыніўшы праграму.\n\nКалі гэта не дапамагло, трэба выдаліць праграму, каб павысіць прадукцыйнасць акумулятара."</string>
@@ -2189,6 +2244,8 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Сервер медыя"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Аптымізацыя дадаткаў"</string>
     <string name="battery_saver" msgid="8172485772238572153">"Эканомія зараду"</string>
+    <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+    <skip />
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Уключаць аўтаматычна"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Ніколі"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"пры ўзроўні зараду акумулятара <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2409,6 +2466,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"Выдаліць уліковы запіс"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Выдаленне гэтага ўлiковага запiсу прывядзе да выдалення ўсіх паведамленняў, кантактаў і іншых дадзеных з планшэта."</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Выдаленне гэтага ўлiковага запiсу прывядзе да выдалення ўсіх паведамленняў, кантактаў і іншых дадзеных з тэлефона."</string>
+    <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+    <skip />
     <string name="remove_account_failed" msgid="3901397272647112455">"Ваш адміністратар не дазваляе гэту змену"</string>
     <string name="provider_label" msgid="7724593781904508866">"Прымусовыя падпіскі"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2945,8 +3004,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Блакіроўка візуальных апавяшчэнняў"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Дазволіць візуальныя сігналы"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"Дадаць"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"УКЛЮЧЫЦЬ"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"АДКЛЮЧЫЦЬ"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Уключыць"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Адключыць"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Рэжым \"Не турбаваць\" уключаны да <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Рэжым \"Не турбаваць\" будзе ўключаны, пакуль вы яго не выключыце"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Рэжым \"Не турбаваць\" быў аўтаматычна ўключаны правілам (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
@@ -2985,7 +3044,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Апавяшчэнні праграм"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Катэгорыя апавяшчэнняў"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"Група катэгорыі апавяшчэнняў"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"Важнасць"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"Паводзіны"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"Дазволіць прайграванне гуку"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Ніколі не паказваць апавяшчэнні"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Без гуку ці візуальнага перапынення"</string>
@@ -3003,6 +3062,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Сярэдняя важнасць"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Высокая важнасць"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"Надзвычайная важнасць"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"Паказваць апавяшчэнні"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Памочнік па апавяшчэннях"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Доступ да апавяшчэнняў"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Доступ да апавяшчэнняў працоўнага профілю заблакіраваны"</string>
@@ -3035,9 +3095,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Доступ да рэжыму «Не турбаваць»"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Запытаў доступу да рэжыму «Не турбаваць» ад усталяваных дадаткаў не паступала"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Загрузка дадаткаў..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android блакіруе апавяшчэнні ад дадзенай праграмы на гэтай прыладзе"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android блакіруе дадзеную катэгорыю апавяшчэнняў на гэтай прыладзе"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android блакіруе дадзеную групу апавяшчэнняў на гэтай прыладзе"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"Па вашым запыце Android блакіруе апавяшчэнні ад дадзенай праграмы на гэтай прыладзе"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Па вашым запыце Android блакіруе дадзеную катэгорыю апавяшчэнняў на гэтай прыладзе"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Па вашым запыце Android блакіруе дадзеную групу апавяшчэнняў на гэтай прыладзе"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Катэгорыі"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Іншае"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3653,31 +3713,10 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Падключана да некалькіх прылад"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Рэжым дэманстрацыі сістэмнага інтэрфейсу карыстальніка"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Пліткі хуткіх налад для распрацоўшчыкаў"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"Мы радыя дапамагчы"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Мы працуем для вас 24/7"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Мы працуем для вас 24/7"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"Наша служба падтрымкі працуе, каб дапамагчы ў вырашэнні любога пытання"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Наша служба падтрымкі даступная кругласутачна кожны дзень"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Пашукайце ў даведцы або звярніцеся ў службу падтрымкі ў гадзіны яе працы (па мясцовым часе):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Гадзіны працы службы падтрымкі па тэлефоне (па мясцовым часе)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Пашукайце ў даведцы або праверце парады і падказкі"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"Падтрымка для наступнай краіны:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"Падарожнічаеце за мяжу?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"Можа быць спагнана плата за міжнародны выклік"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Тэлефон"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"Чат"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Праверце парады і падказкі"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Пашукайце ў даведцы і адпраўце водгук"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"Звяжыцеся са службай падтрымкі"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Увайсці"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"Не можаце ўвайсці ў сістэму?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"Адправіць інфармацыю пра сістэму"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Больш не паказваць"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"Запыт ад"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"Дадаць уліковы запіс"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"Сістэмная інфармацыя"</string>
+    <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+    <skip />
+    <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+    <skip />
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Налады працоўнага профілю"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Пошук кантактаў"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Дазволіць вашай арганізацыі пошук кантактаў, каб вызначаць абанентаў і кантакты"</string>
@@ -3699,11 +3738,12 @@
       <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> секунд</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> секунды</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Пачакайце каля <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Кіраванне сховішчам"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Каб вызваліць месца ў сховішчы, Менеджар сховішча выдаляе фота і відэа, для якіх створаны рэзервовыя копіі, з вашай прылады."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Выдаліць фота і відэа"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Менеджар сховішча"</string>
+    <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+    <skip />
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Аўтаматычна"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Уручную"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Вызваліць месца"</string>
@@ -3883,8 +3923,10 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Аглядны тур па новаму планшэту"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Аглядны тур па новай прыладзе"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Гэта функцыя недаступная на гэтай прыладзе"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Прымусова правесці поўныя вымярэнні GNSS"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Адсочваць усе групы і частоты GNSS з выключаным працоўным цыклам"</string>
+    <!-- no translation found for storage_access (8905018810338984531) -->
     <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+    <!-- no translation found for keywords_storage_access (3708874088152933579) -->
     <skip />
 </resources>
diff --git a/res/values-en-rXC/arrays.xml b/res/values-en-rXC/arrays.xml
index 27e5bb2..3caf221 100644
--- a/res/values-en-rXC/arrays.xml
+++ b/res/values-en-rXC/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‎‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‏‎‎‎‎‎‎‏‎‏‎‎‏‏‏‎‏‎Poor‎‏‎‎‏‎"</item>
     <item msgid="2042505933058940139">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‎‎‎‎‏‏‏‎‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‏‎‎‏‏‏‎‏‎‏‏‎Poor‎‏‎‎‏‎"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‎‎‏‎‎‏‎‏‎‎‏‏‏‎‎‎‏‎‎Over 60 days old‎‏‎‎‏‎"</item>
     <item msgid="5692284879054004388">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‏‏‎‎‎‎‎‏‎‎‎‎‎‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎‎‎‏‎‏‎‎‏‎‎‎Over 90 days old‎‏‎‎‏‎"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‎‎‎‎‎‏‏‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‏‎‏‎‏‏‏‏‎‎‎‎‎‏‎‎‏‏‏‏‏‏‏‏‏‏‎‎Use network preference‎‏‎‎‏‎"</item>
+    <item msgid="8745603368609022803">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‎‎‎‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‏‎‏‎‎‏‏‎Treat as metered‎‏‎‎‏‎"</item>
+    <item msgid="2266114985518865625">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‎‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‎‎‏‏‏‎‎‏‏‎‏‏‎‎‏‎Treat as unmetered‎‏‎‎‏‎"</item>
+  </string-array>
 </resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 14c2641..009367f 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -169,6 +169,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‎‎‎‎‎‏‎‎‏‏‎Your devices‎‏‎‎‏‎"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‎‏‎‏‎‎‏‏‏‎‎‎‎‎Pair new device‎‏‎‎‏‎"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎‎‏‎‏‎‎‎‎‏‎‏‏‎‎‏‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎Allow device to pair and connect to bluetooth devices‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‎‏‏‏‏‎‎‏‎‏‎‏‏‎‎‏‎‏‎‏‎‏‎‎‎‎‎‎‎‏‏‏‏‏‎‏‎Disable in-band ringing‎‏‎‎‏‎"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎Don’t play custom phone ringtones on Bluetooth headsets‎‏‎‎‏‎"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‏‏‎‎‏‎‎‎‎‎‏‏‎‎‏‏‎‎‏‏‎‏‏‏‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‎‏‎‎‎‎‎‎‎‎‏‏‎‎Currently connected‎‏‎‎‏‎"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎Saved devices‎‏‎‎‏‎"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‎‏‏‏‎‏‎‏‏‎‏‏‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‏‎‏‏‏‏‏‎‎‎‏‎‏‏‏‏‏‎‏‎Add device‎‏‎‎‏‎"</string>
@@ -329,6 +331,11 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‏‏‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‏‎‎‏‎‏‎‎‏‏‎‏‎‎‏‎‏‎‎‎‎‎‏‎‏‎‎‏‎Set date‎‏‎‎‏‎"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‏‎‏‎‎‎‏‎‏‎‎‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎‎Sort alphabetically‎‏‎‎‏‎"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‎‎‎‎‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‎‏‏‏‎‏‎‏‏‎‎‏‎‎‏‎‎Sort by time zone‎‏‎‎‏‎"</string>
+    <string name="zone_change_to_from_dst" msgid="118656001224045590">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‎‎‏‎‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‎‏‎‎‏‎‎‎‏‏‎‏‏‎‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="TIME_TYPE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ starts on ‎‏‎‎‏‏‎<xliff:g id="TRANSITION_DATE">%2$s</xliff:g>‎‏‎‎‏‏‏‎.‎‏‎‎‏‎"</string>
+    <string name="zone_time_type_dst" msgid="8850494578766845276">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‏‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‏‏‎‏‏‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‏‎‏‏‏‎‎‎Daylight savings time‎‏‎‎‏‎"</string>
+    <string name="zone_time_type_standard" msgid="3462424485380376522">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‏‏‏‎‎‏‏‎‎‎‏‎‎‎‏‎‏‏‎‏‏‎‎‏‎‎‎‏‏‏‏‏‎‎‏‎‏‎‎Standard time‎‏‎‎‏‎"</string>
+    <string name="zone_menu_by_region" msgid="4603214570803607532">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‏‏‎‏‎‎‎‎‏‏‎‏‏‎‎‏‎‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‎Time zone by region‎‏‎‎‏‎"</string>
+    <string name="zone_menu_by_offset" msgid="1172774718486088771">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‏‎‎‎‏‏‎‏‎‎‎‏‎‎‎‎‏‏‎‎‏‎‎‏‎‎‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‎‎‏‏‎‎‎‏‎‎‎‎‏‏‎Fixed offset time zones‎‏‎‎‏‎"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‎‏‎‎‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‎‎‎‎‎‎‏‏‏‏‎‎‎‏‎‎‎‏‎‎‏‏‏‎‏‎‎‏‎‎‎‎‎‎‎‎Date‎‏‎‎‏‎"</string>
     <string name="time_picker_title" msgid="483460752287255019">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‏‏‎‎‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‎‏‏‏‏‎‏‎‏‏‎Time‎‏‎‎‏‎"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‏‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‏‎‏‏‎‏‏‏‎‎‎‏‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‎Automatically lock‎‏‎‎‏‎"</string>
@@ -347,6 +354,7 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‏‎‏‎‏‎‎‏‎‎‏‎‏‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎Profile info‎‏‎‎‏‎"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‎‎‎‎‎‎‏‏‏‎‏‏‎‏‎‏‎‏‏‎‏‏‎‎‏‎‎‎‎‎‏‎‏‎‏‎‏‎‏‏‎‏‎‏‎‏‎‎‏‏‏‎‎Accounts‎‏‎‎‏‎"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‏‎‎‎‎‏‎‎‎‎‏‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‏‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎Location‎‏‎‎‏‎"</string>
+    <string name="location_settings_master_switch_title" msgid="3560242980335542411">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‎‏‎‎‎‏‎‎‎‎‏‏‎‎‎‏‎‎‎‎‎‏‎‏‎‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎‏‎‎‎‏‎‏‏‎Use location‎‏‎‎‏‎"</string>
     <string name="account_settings_title" msgid="626177544686329806">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‎‎‎‎‏‎‏‎‎‎‎‏‎‎‏‎‏‎‎‎‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎Accounts‎‏‎‎‏‎"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‏‏‎‎‎‏‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎Security &amp; location‎‏‎‎‏‎"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‎‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎Encryption &amp; credentials‎‏‎‎‏‎"</string>
@@ -690,6 +698,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‏‎‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎‎As speaker phone‎‏‎‎‏‎"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‎‏‏‏‎‎For music and media‎‏‎‎‏‎"</string>
     <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="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>
@@ -704,6 +714,7 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‎‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‎‏‏‎‏‏‎‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‏‎‎‏‏‏‏‎‏‎‎Name‎‏‎‎‏‎"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‏‏‎‏‎‏‎‎‎‏‏‎‎‏‏‏‏‎‏‎‏‏‏‎‎‏‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‏‏‎2.4 GHz‎‏‎‎‏‎"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎‎‎‎‏‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‏‎‏‎‎‎‎‎‎‎‏‎‎‏‏‏‏‎‏‎‎‏‎‏‏‎‏‎5 GHz‎‏‎‎‏‎"</string>
+    <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‎‎‏‏‏‎‏‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‎‎‎‎‎‏‎‎‏‏‎‎‎‎‎Sign in‎‏‎‎‏‎"</string>
     <string name="link_speed" msgid="8896664974117585555">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎‎‏‎‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‎‏‎‏‎‎‏‎‎‏‏‎%1$d Mbps‎‏‎‎‏‎"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎‎‏‏‏‎‎‏‎‏‏‎‎‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‏‎‎‏‎‎‎‏‎‎‏‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="REQUESTER">%s</xliff:g>‎‏‎‎‏‏‏‎ wants to turn on Wi-Fi‎‏‎‎‏‎"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‎‏‎‏‏‏‏‏‎‎‏‎‏‎‏‎‏‏‎‎‏‎‎‏‎‎‎‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="REQUESTER">%s</xliff:g>‎‏‎‎‏‏‏‎ wants to turn off Wi-Fi‎‏‎‎‏‎"</string>
@@ -721,6 +732,7 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‏‏‏‎‎‎‏‏‏‎Wi‑Fi‎‏‎‎‏‎"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‎Turn on Wi‑Fi‎‏‎‎‏‎"</string>
     <string name="wifi_settings" msgid="29722149822540994">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‎‎‎‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‎‎‏‎‎‎‏‎‎‎‏‎‏‏‎‎‏‏‎‎‎‎‏‎‎Wi‑Fi‎‏‎‎‏‎"</string>
+    <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‏‎‎‏‎‎‎‏‏‏‎‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎‎‎‏‎‎‎‎‏‏‏‎‏‏‎Use Wi‑Fi‎‏‎‎‏‎"</string>
     <string name="wifi_settings_category" msgid="8719175790520448014">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‎‎‏‎‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‎‏‎‎‎‎‎‏‏‎‏‎‎‎‎‎‎‏‏‏‎‎Wi‑Fi settings‎‏‎‎‏‎"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‏‎‎‎‏‏‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‏‎Wi‑Fi‎‏‎‎‏‎"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‎‏‏‎‏‎‏‎‏‎‏‎‎‎Set up &amp; manage wireless access points‎‏‎‎‏‎"</string>
@@ -832,7 +844,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‎‏‎‎‏‎‎‎‎‏‏‏‎‏‎‎‎‏‎‏‎‏‏‎‎‏‎‎‎‎‏‎‎‎‏‏‏‎‏‏‎‏‎‎‎‎‏‎‏‎ (WPS available)‎‏‎‎‏‎"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‎‏‎‏‎‏‎‏‎‏‎‎‏‎‎‎‏‎‏‎‏‎‏‎‎‏‏‏‎Enter your network password‎‏‎‎‏‎"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‏‎‏‏‎‏‏‎‎‏‏‎‏‎‏‎‎‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‏‎Carrier Wi‑Fi network‎‏‎‎‏‎"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‎‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎Connect via ‎‏‎‎‏‏‎<xliff:g id="NAME">%1%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‎‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎Connect via ‎‏‎‎‏‏‎<xliff:g id="NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‏‎‎‏‎‎‎‎‎‏‏‏‎‏‎‎‎‎‏‏‏‎‎‏‎‎‏‏‎‏‏‎‏‏‎‏‏‎‏‎To improve location accuracy and for other purposes, ‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ wants to turn on network scanning, even when Wi-Fi is off.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Allow this for all apps that want to scan?‎‏‎‎‏‎"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‏‎‏‏‏‎‎‏‎‎‏‏‏‎‎‏‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎‎‏‎‏‏‎‎‏‏‎To turn this off, go to Advanced in the overflow menu.‎‏‎‎‏‎"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‎‎‎‎‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‎‎‏‏‏‎‏‏‎‎‎‏‎‏‏‎‏‎‏‏‎‎‏‎‏‎‎‎‎‎Allow‎‏‎‎‏‎"</string>
@@ -958,6 +970,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‏‏‎‎‎‏‏‎‏‏‏‎‎‎‎‏‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‎‎‎‏‏‎‎‏‎‏‏‏‎‎‏‎Emergency Address‎‏‎‎‏‎"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‎‏‎‎‏‎‎‎‏‎‎‎‏‎‏‏‎‎‎‏‏‏‏‎‎‎‏‎‎‎‏‎‎‏‎‎‏‏‎‎‎‎‏‎‏‎‏‏‏‎‎‏‎Used as your location when you make an emergency call over Wi‑Fi‎‏‎‎‏‎"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‎‏‎‎‏‏‎‏‎‏‎‏‏‎‎‎‏‎‎‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‏‏‎‎‏‏‎‎‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎"<annotation id="url">"‎‏‎‎‏‏‏‎Learn more‎‏‎‎‏‏‎"</annotation>"‎‏‎‎‏‏‏‎ about Private DNS features‎‏‎‎‏‎"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‏‎‏‏‎‏‎‏‎‏‎‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‏‎Display‎‏‎‎‏‎"</string>
     <string name="sound_settings" msgid="5534671337768745343">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎‏‏‏‏‎‎‎‏‏‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‏‏‎Sound‎‏‎‎‏‎"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‏‏‏‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‏‏‏‎‏‎‎‏‏‎‎‏‏‏‎‏‏‎‏‎‎‎‎‏‎Volumes‎‏‎‎‏‎"</string>
@@ -1305,6 +1318,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‎‏‎‏‏‎‏‎‎‎‏‎‏‎‏‏‏‎‏‎‏‏‎‎‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‎‏‎‏‎Your new ‎‏‎‎‏‏‎<xliff:g id="NAME">^1</xliff:g>‎‏‎‎‏‏‏‎ is working. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To move photos, files, and app data to this device, go to Settings &gt; Storage.‎‏‎‎‏‎"</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎‎‏‎‏‎‎‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‎Move ‎‏‎‎‏‏‎<xliff:g id="APP">^1</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‎‎‏‏‎‎‏‎‏‎‏‎‎‏‏‎‏‏‎‏‏‎‎‏‏‏‎‎‏‎‏‏‏‎‎‎‏‎‏‏‏‎‏‎Moving ‎‏‎‎‏‏‎<xliff:g id="APP">^1</xliff:g>‎‏‎‎‏‏‏‎ and its data to ‎‏‎‎‏‏‎<xliff:g id="NAME_0">^2</xliff:g>‎‏‎‎‏‏‏‎ will take only a few moments. You won’t be able to use the app until the move is complete. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Don’t remove the ‎‏‎‎‏‏‎<xliff:g id="NAME_1">^2</xliff:g>‎‏‎‎‏‏‏‎ during the move.‎‏‎‎‏‎"</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‏‏‎‎‎‎‎‎‏‎‎‎‎‏‎‎‎‎‏‏‎‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎‏‏‎‎To move data you need to unlock user ‎‏‎‎‏‏‎<xliff:g id="APP">^1</xliff:g>‎‏‎‎‏‏‏‎.‎‏‎‎‏‎"</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎Moving ‎‏‎‎‏‏‎<xliff:g id="APP">^1</xliff:g>‎‏‎‎‏‏‏‎…‎‏‎‎‏‎"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‎‎‎‎‏‎‏‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎Don’t remove the ‎‏‎‎‏‏‎<xliff:g id="NAME">^1</xliff:g>‎‏‎‎‏‏‏‎ during the move. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎The ‎‏‎‎‏‏‎<xliff:g id="APP">^2</xliff:g>‎‏‎‎‏‏‏‎ app on this device won’t be available until the move is complete.‎‏‎‎‏‎"</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‏‎‎‎‎‏‎‎‎‏‎‏‎‎‎‏‎‎‎‏‏‏‏‏‎‎‎‎Cancel move‎‏‎‎‏‎"</string>
@@ -1465,6 +1479,7 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‏‏‏‏‏‎Location sources‎‏‎‎‏‎"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‎‏‏‎‎‎‏‎‎‏‎‎‎‏‎‎‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‎‎‎‎‎‏‎‏‎About tablet‎‏‎‎‏‎"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‎‎‎‏‏‎‏‏‏‎‎‏‎‏‏‎‎‎‏‏‏‎‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‎‎‎‏‏‎‎‎‎‏‎‎‏‎‏‎About phone‎‏‎‎‏‎"</string>
+    <string name="about_settings" product="device" msgid="6717640957897546887">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎‎‎‏‏‏‎‎‏‎‎‎‎‏‏‏‎About device‎‏‎‎‏‎"</string>
     <string name="about_settings" product="emulator" msgid="221313099578564438">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‏‏‎‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‏‎‏‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎About emulated device‎‏‎‎‏‎"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‎‏‏‏‎View legal info, status, software version‎‏‎‎‏‎"</string>
     <string name="legal_information" msgid="5769301644270604095">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‎‎‎‎‏‎‏‎‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‎‎‎‏‏‏‏‎‎‏‏‏‏‏‏‎Legal information‎‏‎‎‏‎"</string>
@@ -1572,6 +1587,7 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎See all ‎‏‎‎‏‏‎<xliff:g id="COUNT">%1$d</xliff:g>‎‏‎‎‏‏‏‎ apps‎‏‎‎‏‎"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎‎‏‏‎‎‏‎‏‎‏‎‎‎‏‎‏‎‏‎‏‏‏‎‏‎‎‏‎‏‏‎‎‏‏‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‎Your tablet and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your tablet or loss of data that may result from their use.‎‏‎‎‏‎"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‎‏‏‏‏‏‎‎‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‏‎‏‏‎‎‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎Your phone and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your phone or loss of data that may result from their use.‎‏‎‎‏‎"</string>
+    <string name="install_all_warning" product="device" msgid="3648003301476423145">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‎‎‎‏‎‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‎‏‏‏‏‎‏‎‎‏‎Your device and personal data are more vulnerable to attack by unknown apps. By installing apps from this source, you agree that you are responsible for any damage to your device or loss of data that may result from their use.‎‏‎‎‏‎"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‏‏‏‏‎‎‏‏‏‏‎‎‎‏‎‏‎‏‏‎‎‏‏‎‎‎‎‎‏‎Advanced settings‎‏‎‎‏‎"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‎‏‎‎‏‎‎‎‎‎‏‏‎‏‎‎‏‏‎‏‏‎Enable more settings options‎‏‎‎‏‎"</string>
     <string name="application_info_label" msgid="5736524913065714880">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‎‎‎App info‎‏‎‎‏‎"</string>
@@ -1871,6 +1887,9 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‎‎‏‎‏‎‎‎‎‎‏‏‎‏‎‏‏‎‏‏‎‎‎‏‎‏‏‎‏‎‏‏‎‏‎‎‎‏‎‏‎‏‏‎‏‎May affect performance‎‏‎‎‏‎"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‎‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‎‎‏‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‏‏‏‎Click after pointer stops moving‎‏‎‎‏‎"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‏‏‎‎‎‏‏‏‏‏‎‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‎‏‎‏‏‎‎Delay before click‎‏‎‎‏‎"</string>
+    <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="enable_quick_setting" msgid="2366999897816894536">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‏‏‎‎‏‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‎‎‎‏‏‎‎‎‏‎‎‏‎‎‎‎Show in Quick Settings‎‏‎‎‏‎"</string>
@@ -2029,10 +2048,33 @@
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‎‎‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="NUMBER">%1$d</xliff:g>‎‏‎‎‏‏‏‎ apps misbehaving‎‏‎‎‏‎"</string>
     <string name="battery_tip_summary_title" msgid="7060523369832289878">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‎‏‎‎‏‏‎‎‎‏‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‎‎‏‎‏‏‎‎‏‎‏‎‏‏‎‎Battery is in good shape‎‏‎‎‏‎"</string>
     <string name="battery_tip_summary_summary" msgid="7832491466325707487">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‏‎‏‎‎‏‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‎‏‏‏‏‏‎Apps are behaving normally‎‏‎‎‏‎"</string>
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‏‎‎‏‎‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‏‏‏‎‏‏‏‎‎‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‎‏‎‎‏‎Low battery capacity‎‏‎‎‏‎"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‎‎‏‎‏‏‏‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎‎‏‏‏‎‎‎‎‎‎‎‏‎‏‎‎‎‏‎‎‎‏‏‏‏‎‎Battery can\'t provide good battery life‎‏‎‎‏‎"</string>
+    <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‏‏‏‎‎‎‎‎‎‎‏‏‏‎‏‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎Turn on smart battery manager‎‏‎‎‏‎"</string>
+    <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎‎‎‏‎Turn on to optimize battery usage‎‏‎‎‏‎"</string>
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+    <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‏‎‎‎‏‎‏‏‏‎‏‎‎‎‏‏‏‎‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‏‎‏‏‎‎‏‎‏‎‏‎‎Phone used heavily‎‏‎‎‏‎"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‎‏‎‏‎‎‏‏‏‎‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‏‏‎‎‎‏‎‎‎‎‏‏‎‎Tablet used heavily‎‏‎‎‏‎"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‎‎‏‏‎‎‏‎‎‎‎‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‏‏‎‎‏‏‎‎‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎‎Device used heavily‎‏‎‎‏‎"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‏‎‏‎‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‎‎‏‏‏‎‏‏‏‎‎‎‎‎‎‏‎‏‏‏‎‏‎About ‎‏‎‎‏‏‎<xliff:g id="HOUR">%1$s</xliff:g>‎‏‎‎‏‏‏‎ used since last full charge‎‏‎‎‏‎"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‎‎‎‏‏‎‎‏‎‎‏‎‎‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‏‏‎‎‎‏‎‏‏‎‎‏‏‎‏‏‏‏‎‎‎‏‎Your phone was used heavily and this consumed a lot of battery. Your battery is behaving normally.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎ Your phone was used for about ‎‏‎‎‏‏‎<xliff:g id="HOUR">%1$s</xliff:g>‎‏‎‎‏‏‏‎ since last full charge.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎ Total usage:‎‏‎‎‏‎"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‏‎‏‎‏‎‏‎‏‏‎‏‏‎‏‎‏‎Your tablet was used heavily and this consumed a lot of battery. Your battery is behaving normally.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎ Your tablet was used for about ‎‏‎‎‏‏‎<xliff:g id="HOUR">%1$s</xliff:g>‎‏‎‎‏‏‏‎ since last full charge.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎ Total usage:‎‏‎‎‏‎"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‏‎‎‎‏‎‏‎‏‎‏‎‏‏‎‏‎‏‎‏‏‏‎‏‎‏‏‎‏‎‎‏‎‏‏‏‏‏‏‎‎‎‎‎Your device was used heavily and this consumed a lot of battery. Your battery is behaving normally.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎ Your device was used for about ‎‏‎‎‏‏‎<xliff:g id="HOUR">%1$s</xliff:g>‎‏‎‎‏‏‏‎ since last full charge.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎ Total usage:‎‏‎‎‏‎"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‏‎‎‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‎‏‏‎‏‎‏‏‎‏‎‏‎‏‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‏‎‏‏‎‎Smart battery manager‎‏‎‎‏‎"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‎‎‎Auto-manage battery‎‏‎‎‏‎"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‎‏‎‏‏‎‏‏‎‏‏‎‏‎‎‎‏‏‏‎‎‏‎‎‎‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎‏‏‏‎‎‎‏‎‎‎Automatically adjust power usage by apps based on usage‎‏‎‎‏‎"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‎‎‎‏‎‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‏‏‎‎‎‎‏‎‎‏‏‏‎‏‎Restricted apps‎‏‎‎‏‎"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎‏‎‎‏‎‏‏‎‏‎‏‎‏‎‎‎‏‏‎‏‎‎‏‏‎‎‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‎%1$d apps‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎‏‎‎‏‎‏‏‎‏‎‏‎‏‎‎‎‏‏‎‏‎‎‏‏‎‎‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‎%1$d app‎‏‎‎‏‎</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‎‎‎‎‎‎‎‏‏‏‎‏‏‎‎‎‏‏‎‎‏‎‎‎‏‎‏‎‏‏‎‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎Stop app?‎‏‎‎‏‎"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‎‏‎‏‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‏‏‎‏‎‏‎‏‎‎‎‎Your phone can\'t manage battery normally because ‎‏‎‎‏‏‎<xliff:g id="APP">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is keeping your phone awake.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To try to fix this issue, you can stop the app.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎If this keeps happening, you may need to uninstall the app to improve battery performance.‎‏‎‎‏‎"</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‏‏‏‎‎‏‏‏‏‎‎‎Your tablet can\'t manage battery normally because ‎‏‎‎‏‏‎<xliff:g id="APP">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is keeping your tablet awake.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To try to fix this issue, you can stop the app.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎If this keeps happening, you may need to uninstall the app to improve battery performance.‎‏‎‎‏‎"</string>
@@ -2141,6 +2183,7 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‎‏‏‎‎‏‎‏‏‎‏‏‏‏‎‏‏‎‎‎‏‎‏‎Mediaserver‎‏‎‎‏‎"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‏‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‎App optimization‎‏‎‎‏‎"</string>
     <string name="battery_saver" msgid="8172485772238572153">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‏‎‏‎‎‎‎‎‎‎‏‎‎‎‎‎‏‎‏‎‎‏‏‎‏‎‎‎‏‏‎‏‏‎‏‏‎‎‏‎‏‎‎‏‏‏‏‎‎‏‎Battery Saver‎‏‎‎‏‎"</string>
+    <string name="battery_saver_master_switch_title" msgid="622539414546588436">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‎‎‏‏‏‎‏‏‎‏‎‎‎‏‎‎‏‏‎‎‏‎‎‏‎‏‏‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‎‎‎‏‎‏‎‎‎Use Battery Saver‎‏‎‎‏‎"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‎‎‏‎‎‏‎‏‎‏‎‎‏‏‏‏‎‎‎‏‏‏‏‎‏‎‏‏‎‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎Turn on automatically‎‏‎‎‏‎"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‎‎‎‏‎‏‏‏‏‎‏‎‎‎‎‎‎‏‎‏‎Never‎‏‎‎‏‎"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‎‎‏‏‎‎‏‏‎‏‏‎‏‏‎‎‏‏‏‎at ‎‏‎‎‏‏‎<xliff:g id="PERCENT">%1$s</xliff:g>‎‏‎‎‏‏‏‎ battery‎‏‎‎‏‎"</string>
@@ -2361,6 +2404,7 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‎‎‎‏‏‎‎‏‏‏‎‏‎‎‎‏‏‎‏‏‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎Remove account?‎‏‎‎‏‎"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎‏‎‎‎‎‏‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‎Removing this account will delete all of its messages, contacts, and other data from the tablet!‎‏‎‎‏‎"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‎‏‎‎‏‏‎‏‏‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‎Removing this account will delete all of its messages, contacts, and other data from the phone!‎‏‎‎‏‎"</string>
+    <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‏‎‎‎‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‏‎‎‎‎‏‏‎‏‎‎‏‏‎‎Removing this account will delete all of its messages, contacts, and other data from the device!‎‏‎‎‏‎"</string>
     <string name="remove_account_failed" msgid="3901397272647112455">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‏‏‎‎‎‎‏‎‎‏‏‎‎‎‏‎‎‎‏‏‏‏‎‎‏‏‏‏‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎This change isn\'t allowed by your admin‎‏‎‎‏‎"</string>
     <string name="provider_label" msgid="7724593781904508866">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‏‎‏‎‎‎‏‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‎‎‏‎‎‏‏‏‎‎‎‎‎‎‎‏‏‏‏‏‎‎‎‎‏‎‎Push subscriptions‎‏‎‎‏‎"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2885,8 +2929,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‎‎‏‏‎‏‏‎‏‎‏‏‎‏‎‎‎Block visual disturbances‎‏‎‎‏‎"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‏‏‏‏‎‎‎Allow visual signals‎‏‎‎‏‎"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‎‏‏‎‎‎‏‎‏‎Add‎‏‎‎‏‎"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‎‏‏‎‏‎‎‎‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‎‎‏‎‎‎‎‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎TURN ON NOW‎‏‎‎‏‎"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎‎‎‏‏‎‎‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‎‎‎‎TURN OFF NOW‎‏‎‎‏‎"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‎‎‎‎Turn on now‎‏‎‎‏‎"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‏‎‏‎‏‎‏‏‎‏‏‎‎‎‏‎‏‎‎‏‏‎‎‎‎‎‎‎‎‎‏‏‏‎‎‎‎‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‎Turn off now‎‏‎‎‏‎"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‎‎‎‎‏‏‎‏‎‏‏‎‎‏‏‎‎‎‏‎‏‎‎‏‏‏‏‏‎‎‎‎‎‎‏‎Do Not Disturb is on until ‎‏‎‎‏‏‎<xliff:g id="FORMATTED_TIME">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‏‎‏‎‎‎‎‏‎‏‏‏‏‏‏‎‎‎Do Not Disturb will stay on until you turn it off‎‏‎‎‏‎"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‎‏‎‏‎‎‏‏‎‏‏‎‎‎‏‎‏‏‏‎‏‏‎Do Not Disturb was automatically turned on by a rule (‎‏‎‎‏‏‎<xliff:g id="RULE_NAME">%s</xliff:g>‎‏‎‎‏‏‏‎)‎‏‎‎‏‎"</string>
@@ -2925,7 +2969,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‎‎‏‏‎‏‎‏‎‎‎‏‏‎‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎App notifications‎‏‎‎‏‎"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎Notification category‎‏‎‎‏‎"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎‎‏‎‎‎‎‎‎‏‏‎‏‏‏‏‎‎‏‎‏‎‏‎‏‎‏‏‎‎‏‎‎‎‏‎‎‎‏‎Notification category group‎‏‎‎‏‎"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‎‎‏‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‎‎‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‎‏‎‎Importance‎‏‎‎‏‎"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‏‎‎‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‎‎‎‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎Behavior‎‏‎‎‏‎"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎‎‎‎‏‏‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‎Allow sound‎‏‎‎‏‎"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‎‎‎‎‏‎‏‎‏‎‏‏‎‎‎‏‏‎‎‎‎‏‎‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎Never show notifications‎‏‎‎‏‎"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‎‎‎‎‏‎‎‏‏‎‏‏‎‎‎‎‏‏‎No sound or visual interruption‎‏‎‎‏‎"</string>
@@ -2943,6 +2987,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‎‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎Medium importance‎‏‎‎‏‎"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‏‎‎‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‏‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‏‎‏‎‏‏‎High importance‎‏‎‎‏‎"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‎‎‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‏‎‎‏‏‎Urgent importance‎‏‎‎‏‎"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‎‏‏‎‏‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‎‏‏‎‏‎‏‎‎‎‏‎Show notifications‎‏‎‎‏‎"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‎‏‎‎‏‎‎‏‏‎‏‎‎‎‎‏‎‎‎‎‎‏‎‎Notification assistant‎‏‎‎‏‎"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‎‏‎‎‏‎‏‎‏‎‎‎‎‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‎‏‏‏‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎Notification access‎‏‎‎‏‎"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‏‏‎‎‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎‎‎Access to work profile notifications is blocked‎‏‎‎‏‎"</string>
@@ -2973,9 +3018,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‎‎‏‎‎‎‏‏‏‎‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‏‎‎Do Not Disturb access‎‏‎‎‏‎"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎‏‎‏‎‏‎‏‎‎‎No installed apps have requested Do Not Disturb access‎‏‎‎‏‎"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‏‎‏‎‎‏‎‎‏‏‏‎‎‎‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‎‏‏‎‎‎‎‎‏‎‎‎‏‎‎‎‏‎‎‏‎‏‏‏‎Loading apps...‎‏‎‎‏‎"</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‎‎‏‎‏‏‎‎‎‎‏‏‎‎‎‎‏‏‎‏‏‏‏‎‎‎‎‎‎‏‏‎‎‏‎Android is blocking this app\'s notifications from appearing on this device‎‏‎‎‏‎"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‏‎‎‎‎‏‎‎‎‏‎‎‏‎‏‎‏‏‏‎‎‏‏‏‎‏‏‎Android is blocking this category of notifications from appearing on this device‎‏‎‎‏‎"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‏‎‏‎‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‏‏‏‎‎‏‎‎‏‎‎Android is blocking this group of notifications from appearing on this device‎‏‎‎‏‎"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‎‎‏‎‎‏‏‏‏‎‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‏‏‎‎‏‎‏‏‎‏‎‏‎‏‏‎‏‏‏‎At your request, Android is blocking this app\'s notifications from appearing on this device‎‏‎‎‏‎"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‎‏‎‏‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‎‏‎‎‏‎‏‎‎‎‎‏‎‎At your request, Android is blocking this category of notifications from appearing on this device‎‏‎‎‏‎"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‎‎‎‎‏‎‏‏‎‏‏‏‎‎‎‏‎‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‎‏‎‎‏‏‏‏‎‎‎‏‏‏‏‎‏‏‏‏‎‎At your request, Android is blocking this group of notifications from appearing on this device‎‏‎‎‏‎"</string>
     <string name="notification_channels" msgid="5346841743182627500">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‏‎‎‏‏‏‏‎‎‏‏‎‎‎‎‏‏‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‎‎‎‎‏‏‎‎‎‎‎‏‎‏‎‏‎‏‏‎‎‎Categories‎‏‎‎‏‎"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‏‎‎‏‎‎‎‎‎‎‎‎‏‎‏‎‎‎‎‎‏‏‎‎‏‏‎‎‎‏‎‎‎‏‎‎‎‎‏‎‎‎‎‏‎‎Other‎‏‎‎‏‎"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3554,31 +3599,8 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‎‏‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‎‎‏‎‏‏‎‎‎‎‏‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‏‎‎‎‎‎Quick settings developer tiles‎‏‎‎‏‎"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‏‏‎‏‎‏‏‎‏‎‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‏‎‏‎‏‎‎‏‎We\'re here to help‎‏‎‎‏‎"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‎‏‎‎‎‏‏‏‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‎‏‏‎‏‎‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎‎‎‏‎‏‎‎We\'re here for you 24/7‎‏‎‎‏‎"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‏‏‎‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‏‎‎‎‏‏‏‎‏‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎We\'re here for you 24 7‎‏‎‎‏‎"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‎‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎Our support team is here to help address any issue‎‏‎‎‏‎"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‎‏‎‏‎‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‏‎‏‎‎‎‎‎‎‏‏‎‎‏‏‎‏‎‎‏‏‏‎‎‏‏‏‏‎‎‏‏‎Our support team is available all day, every day‎‏‎‎‏‎"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‏‏‎‎‎‏‏‎‏‏‏‏‎Search help or come back during support hours (local time):&lt;br&gt;&lt;b&gt;‎‏‎‎‏‏‎<xliff:g id="OPERATION_HOURS">%s</xliff:g>‎‏‎‎‏‏‏‎&lt;/b&gt;‎‏‎‎‏‎"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‎‏‏‏‎‎‏‏‏‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‎‏‎‏‏‏‏‏‎‎‏‎‏‎Phone support hours (local time)&lt;br&gt;&lt;b&gt;‎‏‎‎‏‏‎<xliff:g id="OPERATION_HOURS">%s</xliff:g>‎‏‎‎‏‏‏‎&lt;/b&gt;‎‏‎‎‏‎"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎‏‎‎‏‎‏‏‎‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‎Search help or explore tips &amp; tricks‎‏‎‎‏‎"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‏‏‎‏‎‏‏‎‏‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎‏‏‏‏‏‎Support for:‎‏‎‎‏‎"</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="support_phone_international_format" msgid="2143528744844720829">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‏‎‎‏‎‏‎‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="LANGUAGE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ (‎‏‎‎‏‏‎<xliff:g id="PHONE">%2$s</xliff:g>‎‏‎‎‏‏‏‎)‎‏‎‎‏‎"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎‏‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‎‏‏‎‏‎‏‎‏‎‎‎‎‎‎‏‎‎‏‏‎‎‏‎‎‏‏‎‎‎‏‏‏‏‎‏‏‏‎Traveling abroad?‎‏‎‎‏‎"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎‏‏‎‏‎‎‎‏‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‏‏‎‎‎‏‏‎‏‏‏‏‎International charges may apply‎‏‎‎‏‎"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‏‎‏‏‎‏‎‎‏‎‏‎‏‏‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎‎‎‎‏‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‏‎Phone‎‏‎‎‏‎"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‎‎‏‏‎‎‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎‏‏‎‎‏‎‎‏‏‏‎‎‏‏‏‎‎‏‎‏‎Chat‎‏‎‎‏‎"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‏‎‎‎‎‎‏‎‏‎‎‎‎‎‎‏‎‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‏‏‏‎‎‎‏‎‏‎‎‎Explore tips &amp; tricks‎‏‎‎‏‎"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‎‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‏‎‎‏‎‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‎Search help &amp; send feedback‎‏‎‎‏‎"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎‏‏‏‎‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‏‎‏‏‏‏‏‎‎‎‎Contact support‎‏‎‎‏‎"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‏‎‎‎‏‎‎‎‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎Sign in‎‏‎‎‏‎"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‏‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎Can\'t sign in?‎‏‎‎‏‎"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‏‎‏‏‏‎‎‏‎‏‎‎‏‏‏‏‎‎‏‎‎‏‏‏‏‏‏‎‏‏‏‏‎Send system information‎‏‎‎‏‎"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‏‎‎‏‏‎Do not show again‎‏‎‎‏‎"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‏‏‎‎‏‏‎‎‎‎‏‏‏‎‎‎‎‏‏‏‎‏‎‎‎‏‎‎‏‎‎‏‎‎‎‏‎‎‏‎‎Requesting as‎‏‎‎‏‎"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‎‎‏‎‏‎‎‎‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‎‎‎‎‏‏‏‎‏‏‏‏‎‎‎‏‏‏‎‎‎‏‏‏‎‎‏‏‎‎Add account‎‏‎‎‏‎"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎‎‏‎‏‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎System information‎‏‎‎‏‎"</string>
+    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‎‏‎‎‎‏‎‎‎‎‎‎‎‏‎‏‎‏‎‏‏‎‏‎‎‎‎‏‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‎‏‏‎‎‏‎‎Window Trace‎‏‎‎‏‎"</string>
+    <string name="layer_trace_quick_settings_title" msgid="2447147947568109649">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‎‎‏‎Layer Trace‎‏‎‎‏‎"</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>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‎‏‏‏‏‎‎‎‏‎‎‏‏‎‎‎‏‎‎‎‎‎Allow contact searches by your organization to identify callers and contacts‎‏‎‎‏‎"</string>
@@ -3594,11 +3616,11 @@
       <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‎‏‎‎‎‎‎‎‎‎‎‏‎‏‏‏‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‏‎<xliff:g id="NUMBER">%s</xliff:g>‎‏‎‎‏‏‏‎ seconds‎‏‎‎‏‎</item>
       <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‎‏‎‎‎‎‎‎‎‎‎‏‎‏‏‏‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎1 second‎‏‎‎‏‎</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‏‏‎‏‎‏‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‎‎‎‎‎‎‎‏‏‎~‎‏‎‎‏‏‎<xliff:g id="ESTIMATE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ wait‎‏‎‎‏‎"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‎‎‎‏‏‎‏‏‎‎‏‎‎‏‎‎‏‎‏‏‏‎‏‎‏‏‎‎‏‎‏‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‏‎Manage storage‎‏‎‎‏‎"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‎‏‏‎‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‎‏‎‎‎‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‏‎‎‎To help free up storage space, storage manager removes backed up photos and videos from your device.‎‏‎‎‏‎"</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‎‎‎‏‎‎‎‏‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‏‏‏‎Remove photos &amp; videos‎‏‎‎‏‎"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‎‎‎‏‏‎‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‎‎‏‏‎‎‏‏‏‎Storage manager‎‏‎‎‏‎"</string>
+    <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‎‎‏‎‎‏‎‏‎‎‎‏‎‏‎‎‏‏‎‏‏‎‏‎‎‎‎‏‎‏‎‏‎‏‏‎‏‎‎‎‎‏‎‏‎‎‏‎Use Storage manager‎‏‎‎‏‎"</string>
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‏‎‏‎‎‏‎‏‎‏‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‎‎‎‎‎‏‏‏‎‎‎‎‏‎‎‎‎Automatic‎‏‎‎‏‎"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‎‎‏‏‏‏‎‎‎‎‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‏‎‎‏‏‎‏‎Manual‎‏‎‎‏‎"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‎‏‎‎‎‎‎‏‎‏‎‏‎‎‏‏‏‎‏‏‎‎‏‏‏‎‎‎‎‏‎‏‏‎‎‎‎‎‏‏‏‎‏‏‎‎‎‏‏‏‏‎‎‎Free up space now‎‏‎‎‏‎"</string>
@@ -3764,8 +3786,8 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‏‏‏‎‏‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎‎Take a tour of your new tablet‎‏‎‎‏‎"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‎‏‏‎‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‏‎‎‏‎‎‏‏‏‎‎‎‎‎‏‏‎‎‎Take a tour of your new device‎‏‎‎‏‎"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎‏‎‎‎‏‏‎‎‎‏‎‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‎‎This feature is not available on this device‎‏‎‎‏‎"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
-    <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
-    <skip />
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‎‏‏‎‏‎‎‎‏‎‎‎‎‎‏‏‎‏‎‎‎‎Force full GNSS measurements‎‏‎‎‏‎"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‎‎‎Track all GNSS constellations and frequencies with no duty cycling‎‏‎‎‏‎"</string>
+    <string name="storage_access" msgid="8905018810338984531">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎‎‏‎‏‎‎‏‏‎Storage access‎‏‎‎‏‎"</string>
+    <string name="keywords_storage_access" msgid="3708874088152933579">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‎‎‎‏‎‎‏‎‎‎‏‎‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‎‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‏‏‎‎‏‎‏‏‎storage access scoped directory‎‏‎‎‏‎"</string>
 </resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index c80097f..9f4721f 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Baja calidad"</item>
     <item msgid="2042505933058940139">"Baja"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"Más de sesenta días"</item>
     <item msgid="5692284879054004388">"Más de noventa días"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"Usar preferencia de red"</item>
+    <item msgid="8745603368609022803">"Tratar como red con tarifa plana"</item>
+    <item msgid="2266114985518865625">"Tratar como red sin tarifa plana"</item>
+  </string-array>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 6b65671..ec77c70 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Tus dispositivos"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sincronizar dispositivo nuevo"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"Permite que el dispositivo se sincronice y se conecte con dispositivos Bluetooth"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Inhabilitar sonido dentro de banda"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"No reproducir tonos del teléfono personalizados en auriculares Bluetooth"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Conectados actualmente"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"Dispositivos guardados"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"Agregar dispositivo"</string>
@@ -330,6 +332,16 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"Establecer la fecha"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordenar alfabéticamente"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenar por zona horaria"</string>
+    <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+    <skip />
+    <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+    <skip />
+    <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+    <skip />
     <string name="date_picker_title" msgid="1338210036394128512">"Fecha"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Bloquear automáticamente"</string>
@@ -348,6 +360,8 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Datos del perfil"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Cuentas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Ubicación"</string>
+    <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+    <skip />
     <string name="account_settings_title" msgid="626177544686329806">"Cuentas"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"Seguridad y ubicación"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encriptación y credenciales"</string>
@@ -691,6 +705,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como altavoz"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música y medios"</string>
     <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="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>
@@ -705,6 +721,8 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nombre"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+    <skip />
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> quiere activar la conexión Wi-Fi"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> quiere desactivar la conexión Wi-Fi"</string>
@@ -722,6 +740,8 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Activar Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+    <skip />
     <string name="wifi_settings_category" msgid="8719175790520448014">"Configuración de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurar y administrar los puntos de acceso de teléfonos inalámbricos"</string>
@@ -833,7 +853,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WSP disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Ingresa la contraseña de la red."</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"Red Wi‑Fi del proveedor"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"Conectarse mediante <xliff:g id="NAME">%1%s</xliff:g>"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Conectarse mediante <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para mejorar la precisión de la ubicación y para otros fines, <xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar la búsqueda de redes, incluso cuando la conexión Wi-Fi esté desactivada.\n\n¿Quieres permitir esto para todas las aplicaciones que deseen buscar redes?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Para desactivar la opción, accede a la sección Avanzada del menú ampliado."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -909,10 +929,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Los hotspots brindan acceso a Internet mediante una conexión de datos móviles. Configura uno a fin de crear una red Wi‑Fi para otros dispositivos. Es posible que se apliquen cargos por el uso de datos móviles."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Las apps pueden crear un hotspot para compartir contenido con dispositivos cercanos."</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Desactivar el hotspot de manera automática"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"El hotspot de Wi‑Fi se desactivará si no hay dispositivos conectados"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Activando zona…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Desactivando zona…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> está activa"</string>
@@ -961,6 +979,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"Dirección de emergencia"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Se usa como tu ubicación cuando haces una llamada de emergencia mediante Wi-Fi"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Más información"</annotation>" sobre las funciones de DNS privado"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sonido"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumen"</string>
@@ -1308,6 +1327,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"El nuevo dispositivo <xliff:g id="NAME">^1</xliff:g> está funcionando. \n\nPara transferir fotos, archivos y datos de aplicaciones a este dispositivo, ve a Configuración y almacenamiento."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Transferir la aplicación <xliff:g id="APP">^1</xliff:g>"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Transferir la aplicación <xliff:g id="APP">^1</xliff:g> y los datos relacionados al dispositivo <xliff:g id="NAME_0">^2</xliff:g> solo demorará un momento. Hasta que no se complete la transferencia, no podrás usar la aplicación. \n\nNo extraigas el dispositivo <xliff:g id="NAME_1">^2</xliff:g> durante el proceso."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Para transferir datos, debes desbloquear al usuario <xliff:g id="APP">^1</xliff:g>."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Transfiriendo la aplicación <xliff:g id="APP">^1</xliff:g>…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Durante el proceso, no extraigas el dispositivo <xliff:g id="NAME">^1</xliff:g>. \n\nLa aplicación <xliff:g id="APP">^2</xliff:g> estará disponible en este dispositivo cuando se complete el proceso."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancelar transferencia"</string>
@@ -1468,6 +1488,8 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"Fuentes de ubicación"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Acerca de la tablet"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Acerca del dispositivo"</string>
+    <!-- no translation found for about_settings (6717640957897546887) -->
+    <skip />
     <string name="about_settings" product="emulator" msgid="221313099578564438">"Acerca del dispositivo emulado"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Ver información legal, estado, versión de software del tablet"</string>
     <string name="legal_information" msgid="5769301644270604095">"Información legal"</string>
@@ -1575,6 +1597,8 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"Ver las <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tu tablet y tus datos personales son más vulnerables a los ataques de apps desconocidas. Si instalas apps de esta fuente, serás responsable de los daños que sufra tu tablet y la pérdida de datos debido al uso de estas apps."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Tu teléfono y tus datos personales son más vulnerables a los ataques de apps desconocidas. Si instalas apps de esta fuente, serás responsable de los daños que sufra tu teléfono y la pérdida de datos debido al uso de estas apps."</string>
+    <!-- no translation found for install_all_warning (3648003301476423145) -->
+    <skip />
     <string name="advanced_settings" msgid="1777249286757067969">"Configuración avanzada"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Activar más opciones de configuración"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Información de la aplicación"</string>
@@ -1874,6 +1898,12 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Puede afectar el rendimiento"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clic cuando deja de moverse el puntero"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Tiempo de espera antes del clic"</string>
+    <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+    <skip />
+    <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+    <skip />
+    <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+    <skip />
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ACTIVADO"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESACTIVADO"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Mostrar en Configuración rápida"</string>
@@ -2030,14 +2060,37 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Activa el dispositivo en segundo plano"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Solicita la ubicación frecuentemente"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps no funcionan correctamente"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"La batería se encuentra en buen estado"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Las apps funcionan de manera correcta"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Capacidad de batería baja"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"La batería no tiene una buena duración"</string>
+    <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+    <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Se usó el teléfono durante bastante tiempo"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Se usó la tablet durante bastante tiempo"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Se usó el dispositivo durante bastante tiempo"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Aproximadamente <xliff:g id="HOUR">%1$s</xliff:g> desde la última carga completa"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Usaste el teléfono durante bastante tiempo, lo que consumió mucha batería. Sin embargo, la batería está funcionando de manera normal.\n\n Se usó el teléfono durante aproximadamente <xliff:g id="HOUR">%1$s</xliff:g> desde la última carga completa.\n\n Uso total:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Usaste la tablet durante bastante tiempo, lo que consumió mucha batería. Sin embargo, la batería está funcionando de manera normal.\n\n Se usó la tablet durante aproximadamente <xliff:g id="HOUR">%1$s</xliff:g> desde la última carga completa.\n\n Uso total:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Usaste el dispositivo durante bastante tiempo, lo que consumió mucha batería. Sin embargo, la batería está funcionando de manera normal.\n\n Se usó el dispositivo durante aproximadamente <xliff:g id="HOUR">%1$s</xliff:g> desde la última carga completa.\n\n Uso total:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"Administrador de batería inteligente"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"Administración automática de batería"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"Ajustar automáticamente el consumo de energía de las apps en función de su uso"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"Apps restringidas"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="other">%1$d apps</item>
+      <item quantity="one">%1$d app</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"¿Quieres detener la app?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Tu teléfono no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP">%1$s</xliff:g> lo mantiene activo.\n\nPara solucionar este problema, detén la app.\n\nSi el problema persiste, es posible que debas desinstalarla para mejorar el rendimiento de la batería."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Tu tablet no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP">%1$s</xliff:g> la mantiene activa.\n\nPara solucionar este problema, detén la app.\n\nSi el problema persiste, es posible que debas desinstalarla para mejorar el rendimiento de la batería."</string>
@@ -2146,6 +2199,8 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Servidor de medios"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Optimización de las aplicaciones"</string>
     <string name="battery_saver" msgid="8172485772238572153">"Ahorro de batería"</string>
+    <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+    <skip />
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Activar automáticamente"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nunca"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"con <xliff:g id="PERCENT">%1$s</xliff:g> de batería"</string>
@@ -2366,6 +2421,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"¿Deseas eliminar la cuenta?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Si eliminas esta cuenta, se borrarán todos sus mensajes, contactos y otros datos de la tablet."</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Si eliminas esta cuenta, se borrarán todos sus mensajes, contactos y otros datos del dispositivo."</string>
+    <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+    <skip />
     <string name="remove_account_failed" msgid="3901397272647112455">"El administrador no permite este cambio"</string>
     <string name="provider_label" msgid="7724593781904508866">"Suscripciones de inserción"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2890,8 +2947,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Bloquear alteraciones visuales"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permitir señales visuales"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"Agregar"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ACTIVAR AHORA"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"DESACTIVAR AHORA"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Activar ahora"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Desactivar ahora"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"El modo \"No interrumpir\" estará activado hasta la(s) <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"El modo \"No interrumpir\" permanecerá activado hasta que lo desactives"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Una regla (<xliff:g id="RULE_NAME">%s</xliff:g>) activó el modo \"No interrumpir\" automáticamente"</string>
@@ -2930,7 +2987,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificaciones de aplicaciones"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoría de notificaciones"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"Categoría del grupo de notificaciones"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"Importancia"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"Comportamiento"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"Permitir sonido"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"No mostrar notificaciones"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"No emitir sonido ni mostrar"</string>
@@ -2948,6 +3005,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Mediana importancia"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importancia alta"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"Urgente"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"Ver notificaciones"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Asistente de notificaciones"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Acceso a notificaciones"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"El acceso a las notificaciones del perfil de trabajo está bloqueado"</string>
@@ -2976,9 +3034,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acceso en No molestar"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ninguna aplicación instalada solicitó acceso en No molestar."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicaciones…"</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android bloquea las notificaciones de esta app para que no aparezcan en el dispositivo"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android bloquea esta categoría de notificaciones para que no aparezca en el dispositivo"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android bloquea este grupo de notificaciones para que no aparezca en el dispositivo"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"Como lo solicitaste, Android bloquea las notificaciones de esta app para que no se muestren en el dispositivo"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Como lo solicitaste, Android bloquea esta categoría de notificaciones para que no se muestren en el dispositivo"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Como lo solicitaste, Android bloquea este grupo de notificaciones para que no se muestren en el dispositivo"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categorías"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Otros"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3100,7 +3158,7 @@
     <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>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuración de notificaciones"</string>
     <string name="suggestion_button_text" msgid="3275010948381252006">"Aceptar"</string>
-    <string name="device_feedback" msgid="3238056036766293294">"Envía comentarios del dispositivo"</string>
+    <string name="device_feedback" msgid="3238056036766293294">"Enviar comentarios del dispositivo"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Ingresa el PIN de administrador"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Activado"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Desactivado"</string>
@@ -3557,31 +3615,10 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"Mosaicos de configuración rápida para programadores"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"Estamos aquí para ayudarte"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Estamos disponibles todos los días, las 24 horas."</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Estamos disponibles todos los días, las 24 horas."</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"Nuestro equipo de asistencia está disponible para solucionar cualquier problema"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Nuestro equipo de asistencia está disponible a toda hora, todos los días"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Busca ayuda o vuelve en el horario de atención (hora local):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Horario de atención telefónica (hora local)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Busca ayuda o explora sugerencias y trucos"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"Compatibilidad con:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"¿Vas a viajar al extranjero?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"Pueden aplicarse cargos internacionales"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Teléfono"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Explorar sugerencias y trucos"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Buscar ayuda y enviar comentarios"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"Comunícate con el equipo de asistencia"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Acceder"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"¿No puedes acceder?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"Enviar información del sistema"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"No volver a mostrar"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"Solicitando como"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"Agregar cuenta"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"Información del sistema"</string>
+    <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+    <skip />
+    <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+    <skip />
     <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>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Permitir que tu organización busque contactos para identificar a emisores y contactos"</string>
@@ -3597,11 +3634,12 @@
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
       <item quantity="one">1 segundo</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Espera estimada: alrededor de <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Administrar el almacenamiento"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"El administrador de almacenamiento quita de tu dispositivo las fotos y los videos con copia de seguridad para liberar espacio de almacenamiento."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Quitar fotos y videos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Administrador de almacenamiento"</string>
+    <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+    <skip />
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automático"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Liberar espacio ahora"</string>
@@ -3767,8 +3805,10 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Descubre tu nueva tablet"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Descubre tu nuevo dispositivo"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"La función no está disponible en este dispositivo"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forzar dimensiones GNSS completas"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Seguir todas las frecuencias y constelaciones de GNSS sin ciclo de funciones"</string>
+    <!-- no translation found for storage_access (8905018810338984531) -->
     <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+    <!-- no translation found for keywords_storage_access (3708874088152933579) -->
     <skip />
 </resources>
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index b89700f..c23ae26 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Eskasa"</item>
     <item msgid="2042505933058940139">"Txarra"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"60 egunetik gorakoak"</item>
     <item msgid="5692284879054004388">"90 egunetik gorakoak"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"Erabili sarearen hobespena"</item>
+    <item msgid="8745603368609022803">"Tratatu sare mugatu gisa"</item>
+    <item msgid="2266114985518865625">"Tratatu mugatu gabeko sare gisa"</item>
+  </string-array>
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 072d879..bc268c4 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Zure gailuak"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Parekatu gailu batekin"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"Baimendu gailuari Bluetooth gailuekin parekatzea eta konektatzea"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Desgaitu tonuak audio-kanal berean erreproduzitzeko aukera"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Ez erreproduzitu telefonoko tonu pertsonalizatuak Bluetooth entzungailuetan"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Konektatuta daudenak"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"Gordetako gailuak"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"Gehitu gailu bat"</string>
@@ -330,6 +332,16 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"Ezarri data"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordenatu alfabetikoki"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenatu ordu-zonaren arabera"</string>
+    <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+    <skip />
+    <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+    <skip />
+    <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+    <skip />
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Ordua"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Blokeatu automatikoki"</string>
@@ -348,6 +360,8 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Profilaren informazioa"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Kontuak"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Kokapena"</string>
+    <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+    <skip />
     <string name="account_settings_title" msgid="626177544686329806">"Kontuak"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"Segurtasuna eta kokapena"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Enkriptatzea eta kredentzialak"</string>
@@ -691,6 +705,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Bozgorailu gisa"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Musikarako eta multimedia-edukirako"</string>
     <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="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>
@@ -705,6 +721,8 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Izena"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+    <skip />
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mb/s"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> aplikazioak Wi-Fi konexioa aktibatu nahi du"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> aplikazioak Wi-Fi konexioa desaktibatu nahi du"</string>
@@ -722,6 +740,8 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Aktibatu Wi-Fia"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+    <skip />
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi ezarpenak"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Konfiguratu eta kudeatu hari gabeko sarbide-puntuak"</string>
@@ -833,7 +853,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPSa erabilgarri)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Idatzi sarearen pasahitza"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"Operadorearen Wi‑Fi sarea"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"Konektatu <xliff:g id="NAME">%1%s</xliff:g> bidez"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Konektatu <xliff:g id="NAME">%1$s</xliff:g> bidez"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Kokapenaren zehaztasuna hobetzeko eta beste helburu batzuetarako, <xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak sare-bilaketa aktibatu nahi du, Wi-Fia desaktibatuta egonda ere.\n\nBilaketa egin nahi duten beste aplikazio guztiei ere baimendu nahi diezu?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Desaktibatzeko, joan menuko \"Ezarpen aurreratuak\" aukerara."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Baimendu"</string>
@@ -959,6 +979,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"Larrialdietarako helbidea"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Kokapen gisa erabiliko da larrialdi-zerbitzuetara Wi-Fi bidez deituz gero"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Lortu informazio gehiago"</annotation>" DNS pribatuaren eginbideei buruz"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Bistaratzea"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Soinua"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Bolumenak"</string>
@@ -1306,6 +1327,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> memoria berria abian da. \n\nArgazkiak, fitxategiak eta aplikazioaren datuak gailu honetara ekartzeko, zoaz Ezarpenak &gt; Memoria atalera."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Mugitu <xliff:g id="APP">^1</xliff:g>"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> aplikazioa eta bere datuak <xliff:g id="NAME_0">^2</xliff:g> memoriara eramateak denboratxo bat behar du. Ezin izango duzu aplikazioa erabili transferentzia osatzen den arte. \n\n Ez kendu <xliff:g id="NAME_1">^2</xliff:g> transferentzia egiten den bitartean."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Datuak mugitzeko, <xliff:g id="APP">^1</xliff:g> erabiltzailea desblokeatu behar duzu."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> mugitzen…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Ez kendu <xliff:g id="NAME">^1</xliff:g> transferentzia egiten den bitartean. \n\nGailuko <xliff:g id="APP">^2</xliff:g> aplikazioa ez da erabilgarri egongo transferentzia osatzen den arte."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Utzi transferentzia"</string>
@@ -1466,6 +1488,8 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"Kokapenaren iturburuak"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Tabletari buruz"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Telefonoari buruz"</string>
+    <!-- no translation found for about_settings (6717640957897546887) -->
+    <skip />
     <string name="about_settings" product="emulator" msgid="221313099578564438">"Emulatutako gailuari buruz"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Ikusi legezko informazioa, egoera, software-bertsioa"</string>
     <string name="legal_information" msgid="5769301644270604095">"Lege-informazioa"</string>
@@ -1573,6 +1597,8 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"Ikusi <xliff:g id="COUNT">%1$d</xliff:g> aplikazioak"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tabletak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartzen duzu haiek erabiltzeagatik tabletari gerta dakizkiokeen kalteen edo datu-galeren erantzulea zeu zarela."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefonoak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartzen duzu haiek erabiltzeagatik telefonoari gerta dakizkiokeen kalteen edo datu-galeren erantzulea zeu zarela."</string>
+    <!-- no translation found for install_all_warning (3648003301476423145) -->
+    <skip />
     <string name="advanced_settings" msgid="1777249286757067969">"Ezarpen aurreratuak"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Gaitu ezarpenen aukera gehiago"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Aplikazioen informazioa"</string>
@@ -1868,10 +1894,16 @@
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Audio monofonikoa"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Konbinatu kanalak audioa erreproduzitzean"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Sakatuta edukitzearen atzerapena"</string>
-    <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Koloreak alderantzikatzeko aukera"</string>
+    <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Koloreen alderantzikatzea"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Baliteke errendimenduan eragina izatea"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Egin klik erakusleak mugitzeari uztean"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Klik egin aurretiko atzerapena"</string>
+    <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+    <skip />
+    <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+    <skip />
+    <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+    <skip />
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"AKTIBATUTA"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESAKTIBATUTA"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Erakutsi Ezarpen bizkorretan"</string>
@@ -2030,10 +2062,35 @@
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplikazio ez dira ari behar bezala funtzionatzen"</string>
     <string name="battery_tip_summary_title" msgid="7060523369832289878">"Bateriaren egoera ona da"</string>
     <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Aplikazioen portaera normala da"</string>
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Bateriaren edukiera txikiegia da"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Bateriak ezin du eskaini iraupen onargarria"</string>
+    <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
     <skip />
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+    <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Telefonoa asko erabili da"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Tableta asko erabili da"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Gailua asko erabili da"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"<xliff:g id="HOUR">%1$s</xliff:g> inguru erabili da bateria guztiz kargatu zenetik"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Telefonoa asko erabili da eta bateria asko kontsumitu da. Modu normalean dabil bateria.\n\n <xliff:g id="HOUR">%1$s</xliff:g> inguru erabili da telefonoa bateria guztiz kargatu zenetik.\n\n Erabilera, guztira:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Tableta asko erabili da eta bateria asko kontsumitu da. Modu normalean dabil bateria.\n\n <xliff:g id="HOUR">%1$s</xliff:g> inguru erabili da tableta bateria guztiz kargatu zenetik.\n\n Erabilera, guztira:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Gailua asko erabili da eta bateria asko kontsumitu da. Modu normalean dabil bateria.\n\n <xliff:g id="HOUR">%1$s</xliff:g> inguru erabili da gailua bateria guztiz kargatu zenetik.\n\n Erabilera, guztira:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"Bateria-kudeatzaile adimenduna"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"Kudeatu automatikoki bateria"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"Doitu automatikoki aplikazioek erabiltzen duten bateria, erabileran oinarrituta"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"Aplikazio murriztuak"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="other">%1$d aplikazio</item>
+      <item quantity="one">%1$d aplikazio</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"Aplikazioa gelditu nahi duzu?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"<xliff:g id="APP">%1$s</xliff:g>\n\n\n\n"</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Tabletak ezin du kudeatu bateria modu normalean <xliff:g id="APP">%1$s</xliff:g> aplikazioak esnarazi egiten duelako etengabe.\n\nArazoa konpontzeko, geldiarazi aplikazioa.\nArazoa horrela ere konpontzen ez bada\n, agian aplikazioa desinstalatu beharko duzu bateriak gehiago iraun dezan."</string>
@@ -2142,6 +2199,8 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Multimedia-zerbitzaria"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Aplikazio-optimizazioa"</string>
     <string name="battery_saver" msgid="8172485772238572153">"Bateria-aurrezlea"</string>
+    <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+    <skip />
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Aktibatu automatikoki"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Inoiz ez"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"bateriaren maila <xliff:g id="PERCENT">%1$s</xliff:g> denean"</string>
@@ -2266,7 +2325,7 @@
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Wi-Fi pasahitzen, laster-marken, bestelako ezarpenen eta aplikazioetako datuen babeskopiak egiteari utzi eta Google zerbitzarietako kopia guztiak ezabatu nahi dituzu?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"Gailuko datuen (adibidez, Wi-Fi pasahitzak eta deien historia) eta aplikazioetako datuen (besteak beste, ezarpenak eta aplikazioek gordetako fitxategiak) babeskopiak egiteari utzi nahi diozu eta urruneko zerbitzarietako kopia guztiak ezabatu nahi dituzu?"</string>
-    <string name="fullbackup_data_summary" msgid="960850365007767734">"Egin babeskopiak automatikoki urrunetik, bai gailuetako datuenak (esaterako, Wi-Fi sareetako pasahitzak eta deien historia), bai aplikazioetako datuenak (esaterako, ezarpenak eta aplikazioek gordetako fitxategiak).\n\nBabeskopiak automatikoki egiteko aukera aktibatzean, gailuko eta aplikazioetako datuak urrunetik gordetzen dira aldizka. Aplikazioetako datuak aplikazioek gordetako edozein datu izan daitezke (garatzailearen ezarpenen arabera), eta isilpekoa izan litekeen informazioa ere sar daiteke (adibidez, kontaktuak, mezuak eta argazkiak)."</string>
+    <string name="fullbackup_data_summary" msgid="960850365007767734">"Egin babeskopiak automatikoki urrunetik, bai gailuetako datuenak (esaterako, Wi-Fi sareetako pasahitzak eta deien historia), bai aplikazioetako datuenak (esaterako, ezarpenak eta aplikazioek gordetako fitxategiak).\n\nBabeskopiak automatikoki egiteko aukera aktibatzean, gailuko eta aplikazioetako datuak urrunetik gordetzen dira aldizka. Aplikazioetako datuak aplikazioek gordetako edozein datu izan daitezke (garatzailearen ezarpenen arabera), eta kontuzkoa izan litekeen informazioa ere sar daiteke (adibidez, kontaktuak, mezuak eta argazkiak)."</string>
     <string name="device_admin_settings_title" msgid="4960761799560705902">"Gailua administratzeko aplikazioaren ezarpenak"</string>
     <string name="active_device_admin_msg" msgid="578748451637360192">"Gailua administratzeko aplikazioa"</string>
     <string name="remove_device_admin" msgid="9207368982033308173">"Desaktibatu gailua administratzeko aplikazioa"</string>
@@ -2362,6 +2421,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"Kontua kendu?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Kontua kentzen baduzu, bere mezu, kontaktu eta bestelako datu guztiak tabletatik ezabatuko dira!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Kontua kentzen baduzu, bere mezu, kontaktu eta bestelako datu guztiak telefonotik ezabatuko dira!"</string>
+    <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+    <skip />
     <string name="remove_account_failed" msgid="3901397272647112455">"Administratzaileak ez du eman aldaketa egiteko baimena"</string>
     <string name="provider_label" msgid="7724593781904508866">"Push-harpidetzak"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2676,7 +2737,7 @@
     <string name="extreme_threats_summary" msgid="8777860706500920667">"Jaso bizitza eta jabetzen aurkako mehatxu oso larrien alertak"</string>
     <string name="severe_threats_title" msgid="8362676353803170963">"Mehatxu larriak"</string>
     <string name="severe_threats_summary" msgid="8848126509420177320">"Jaso bizitza eta jabetzen aurkako mehatxu larrien alertak"</string>
-    <string name="amber_alerts_title" msgid="2772220337031146529">"AMBER abisuak"</string>
+    <string name="amber_alerts_title" msgid="2772220337031146529">"AMBER alertak"</string>
     <string name="amber_alerts_summary" msgid="4312984614037904489">"Jaso umeen bahiketei buruzko mezuak"</string>
     <string name="repeat_title" msgid="6473587828597786996">"Errepikapena"</string>
     <string name="call_manager_enable_title" msgid="7718226115535784017">"Gaitu dei-kudeatzailea"</string>
@@ -2684,7 +2745,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Dei-kudeatzailea"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Larrialdi-abisuak"</string>
+    <string name="cell_broadcast_settings" msgid="4124461751977706019">"Larrialdi-alertak"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Sare-operadoreak"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Sarbide-puntuen izenak"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"4G LTE modu hobetua"</string>
@@ -2859,7 +2920,7 @@
     <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">"Abisua"</string>
+    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerta"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Dar-dar"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Pizteko soinuak"</string>
     <string name="zen_mode_settings_summary_off" msgid="6119891445378113334">"Inoiz ez"</string>
@@ -2886,8 +2947,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blokeatu oztopo bisualak"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Baimendu seinale bisualak"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"Gehitu"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"AKTIBATU"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"DESAKTIBATU"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Aktibatu"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Desaktibatu"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> arte egongo da aktibatuta \"Ez molestatu\" modua"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Desaktibatzen duzun arte egongo da aktibatuta \"Ez molestatu\" modua"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"<xliff:g id="RULE_NAME">%s</xliff:g> arauak automatikoki aktibatu du \"Ez molestatu\" modua"</string>
@@ -2926,7 +2987,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Aplikazioen jakinarazpenak"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Jakinarazpenaren kategoria"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"Jakinarazpenen kategoria-taldea"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"Garrantzia"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"Jokabidea"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"Baimendu soinua egitea"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Ez erakutsi jakinarazpenik inoiz"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Ez egin soinurik eta ez erakutsi"</string>
@@ -2944,6 +3005,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Garrantzi ertainekoa"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Garrantzi handikoa"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"Premiazkoa"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"Erakutsi jakinarazpenak"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Jakinarazpenen laguntzailea"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Jakinarazpenetarako sarbidea"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Blokeatuta dago laneko profileko jakinarazpenetarako sarbidea"</string>
@@ -2974,9 +3036,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"\"Ez molestatu\" aukerarako sarbidea"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ez dago \"Ez molestatu\" aukerarako sarbidea eskatu duen aplikaziorik"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Aplikazioak kargatzen…"</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Aplikazio honen jakinarazpenak gailu honetan erakustea galarazten ari da Android"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Kategoria honetako jakinarazpenak gailu honetan erakustea galarazten ari da Android"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Talde honetako jakinarazpenak gailu honetan erakustea galarazten ari da Android"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"Zure eskaerari jarraiki, aplikazio honen jakinarazpenak gailu honetan erakustea galarazten ari da Android"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Zure eskaerari jarraiki, jakinarazpen-kategoria hau gailu honetan erakustea galarazten ari da Android"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Zure eskaerari jarraiki, jakinarazpen talde hau gailu honetan erakustea galarazten ari da Android"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategoriak"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Beste batzuk"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3233,7 +3295,7 @@
     <string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g> / <xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Bateria-optimizazioa"</string>
-    <string name="additional_battery_info" msgid="4754099329165411970">"Erabilera-abisuak"</string>
+    <string name="additional_battery_info" msgid="4754099329165411970">"Erabilera-alertak"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Erakutsi gailuaren erabilera guztia"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Erakutsi aplikazioaren erabilera"</string>
     <string name="power_high_usage_title" msgid="6027369425057347826">"Kontsumo handia"</string>
@@ -3555,31 +3617,10 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"Ezarpen bizkorretako garatzaileentzako lauzak"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"Laguntzeko gauzkazu"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Laguntzeko prest gauzkazu beti, gau eta egun."</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Laguntzeko prest gauzkazu beti, gau eta egun"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"Arazoak konpontzen laguntzeko prest duzu gure laguntza-taldea"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Gure laguntza-taldea laguntzeko prest izango duzu egunero-egunero, gau eta egun"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Bilatu laguntzan edo itzuli laguntza eskaintzen dugun orduetan (bertako orduan):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Telefono bidezko laguntza-zerbitzuaren ordutegia (bertako orduan)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Bilatu laguntza edo arakatu aholkuak"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"Jaso laguntza hemen:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"Atzerrira zoaz?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"Nazioarteko gastuak izan ditzakezu"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefonoa"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"Txateatu"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Irakurri aholkuak eta trikimailuak"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Egin bilaketak laguntza-edukian eta eman zure iritzia"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"Jarri laguntza-zerbitzuarekin harremanetan"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Hasi saioa"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"Ezin duzu saioa hasi?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"Bidali sistemari buruzko informazioa"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Ez erakutsi berriro"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"Kontu honen izenean egin da eskaera:"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"Gehitu kontua"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"Sistemari buruzko informazioa"</string>
+    <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+    <skip />
+    <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+    <skip />
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Laneko profilaren ezarpenak"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontaktu-bilaketak"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Onartu erakundeko kontaktu-bilaketek deitzaileak eta kontaktuak identifikatzea"</string>
@@ -3595,11 +3636,12 @@
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segundo</item>
       <item quantity="one">Segundo bat</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"<xliff:g id="ESTIMATE">%1$s</xliff:g> inguru itxaron behar izaten da"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Kudeatu memoria"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Memorian tokia egiteko, babeskopiak dituzten argazkiak eta bideoak gailutik kentzen ditu memoria-kudeatzaileak."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Kendu argazkiak eta bideoak"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Memoria-kudeatzailea"</string>
+    <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+    <skip />
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatikoa"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Eskuzko ezarpenak"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Egin tokia"</string>
@@ -3765,8 +3807,10 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Eman txango bat tableta berrian barrena"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Eman txango bat gailu berrian barrena"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Eginbidea ez dago erabilgarri gailu honetan"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Behartu GNSS neurketa osoak gauzatzera"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Egin GNSS konstelazio eta maiztasun guztien jarraipena, eginbeharren ziklorik gabe"</string>
+    <!-- no translation found for storage_access (8905018810338984531) -->
     <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+    <!-- no translation found for keywords_storage_access (3708874088152933579) -->
     <skip />
 </resources>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index 2b9a5a6..4a60086 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Faible"</item>
     <item msgid="2042505933058940139">"Faible"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"Datées de plus de 60 jours"</item>
     <item msgid="5692284879054004388">"Datées de plus de 90 jours"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"Utiliser la préférence de réseau"</item>
+    <item msgid="8745603368609022803">"Traiter comme mesuré"</item>
+    <item msgid="2266114985518865625">"Traiter comme non mesuré"</item>
+  </string-array>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 9e6ca69..d8e8922 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vos appareils"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Associer un nouvel appareil"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"Autorisez l\'appareil à s\'associer et à se connecter à des appareils Bluetooth"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Désactiver la signalisation intra-bande"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Ne pas faire jouer de sonneries téléphoniques personnalisées sur les écouteurs Bluetooth"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Actuellement connecté"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"Appareils enregistrés"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"Ajouter un appareil"</string>
@@ -330,6 +332,11 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"Définir la date"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Trier par ordre alphabétique"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Trier par fuseau horaire"</string>
+    <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> commence le <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+    <string name="zone_time_type_dst" msgid="8850494578766845276">"Heure avancée"</string>
+    <string name="zone_time_type_standard" msgid="3462424485380376522">"Heure normale"</string>
+    <string name="zone_menu_by_region" msgid="4603214570803607532">"Fuseau horaire par région"</string>
+    <string name="zone_menu_by_offset" msgid="1172774718486088771">"Fuseaux horaires à décalage fixe"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Date"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Heures"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Verrouiller automatiquement après"</string>
@@ -348,6 +355,7 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Infos de profil"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Comptes"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Position"</string>
+    <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Utiliser ma position"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Comptes"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"Sécurité et localisation"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Cryptage et authentifiants"</string>
@@ -691,6 +699,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Comme téléphone à haut-parleur"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pour la musique et le multimédia"</string>
     <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="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>
@@ -705,6 +715,7 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nom"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Connexion"</string>
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mb/s"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> souhaite activer le Wi-Fi"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> souhaite désactiver le Wi-Fi"</string>
@@ -722,6 +733,7 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Activer le Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Utiliser le Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="8719175790520448014">"Paramètres Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurer et gérer les points d\'accès sans fil"</string>
@@ -833,7 +845,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Entrez votre mot de passe réseau"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"Réseau Wi-Fi du fournisseur de services"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"Se connecter au réseau de <xliff:g id="NAME">%1%s</xliff:g>"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Se connecter au réseau de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Pour améliorer la précision de la position et à d\'autres fins, <xliff:g id="APP_NAME">%1$s</xliff:g> souhaite activer la recherche de réseaux, même lorsque le Wi-Fi est désactivé.\n\nDonner cette autorisation à toutes les applications souhaitant activer la recherche de réseaux?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Pour désactiver cette option, sélectionnez « Paramètres avancés » dans le menu à développer."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Autoriser"</string>
@@ -909,10 +921,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Bande du point d\'accès"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Un point d\'accès vous permet de créer un réseau Wi-Fi pour vos autres appareils. Il les connecte à Internet en utilisant votre connexion de données cellulaires. Des frais supplémentaires peuvent s\'appliquer."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Les applications peuvent créer un point d\'accès pour partager du contenu avec les appareils à proximité."</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Désactiver automatiquement le point d\'accès Wi‑Fi"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Le point d\'accès Wi‑Fi se désactive si aucun appareil n\'est connecté"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Activation du point d\'accès Wi-Fi en cours…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Désactivation du point d\'accès Wi-Fi en cours…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> est actif"</string>
@@ -961,6 +971,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"Adresse d\'urgence"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Cette adresse sera définie comme votre position géographique lorsque vous effectuerez des appels d\'urgence par Wi-Fi"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"En savoir plus"</annotation>" sur la fonctionnalité de DNS privé"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Affichage"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
@@ -1308,6 +1319,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Votre nouvelle mémoire de stockage « <xliff:g id="NAME">^1</xliff:g> » fonctionne correctement. \n\nPour déplacer des photos, des fichiers et des données d\'application sur cet appareil, sélectionnez Paramètres &gt; Stockage."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Déplacer <xliff:g id="APP">^1</xliff:g>"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Le déplacement de l\'application « <xliff:g id="APP">^1</xliff:g> » et des données correspondantes vers « <xliff:g id="NAME_0">^2</xliff:g> » ne prend que quelques minutes. Vous ne pourrez pas utiliser l\'application tant que l\'opération n\'est pas terminée. \n\nNe retirez pas la mémoire de stockage « <xliff:g id="NAME_1">^2</xliff:g> » pendant le déplacement."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Pour déplacer des données, vous devez déverrouiller l\'utilisateur <xliff:g id="APP">^1</xliff:g>."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Déplacement de <xliff:g id="APP">^1</xliff:g> en cours..."</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Ne retirez pas la mémoire de stockage « <xliff:g id="NAME">^1</xliff:g> » pendant le déplacement. \n\nL\'application « <xliff:g id="APP">^2</xliff:g> » ne sera pas disponible tant que l\'opération n\'est pas terminée."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Annuler le déplacement"</string>
@@ -1468,6 +1480,7 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"Sources de localisation"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"À propos de la tablette"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"À propos du téléphone"</string>
+    <string name="about_settings" product="device" msgid="6717640957897546887">"À propos de l\'appareil"</string>
     <string name="about_settings" product="emulator" msgid="221313099578564438">"À propos de l\'appareil émulé"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Informations légales, état et version du logiciel"</string>
     <string name="legal_information" msgid="5769301644270604095">"Renseignements juridiques"</string>
@@ -1575,6 +1588,7 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"Afficher les <xliff:g id="COUNT">%1$d</xliff:g> applications"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Votre tablette et vos données personnelles sont plus vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être le seul responsable de tout dommage causé à votre tablette ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Votre téléphone et vos données personnelles sont plus vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être le seul responsable de tout dommage causé à votre téléphone ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
+    <string name="install_all_warning" product="device" msgid="3648003301476423145">"Votre appareil et vos données personnelles sont plus vulnérables aux attaques provenant d\'applications inconnues. En installant des applications provenant de cette source, vous acceptez d\'être responsable de tout dommage causé à votre appareil ou de toute perte de données pouvant découler de l\'utilisation de telles applications."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Paramètres avancés"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Activer d\'autres paramètres"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informations sur l\'application"</string>
@@ -1874,6 +1888,9 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Pourrait nuire aux performances"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Cliquer lorsque curseur arrête"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Délai précédant le clic"</string>
+    <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="enable_quick_setting" msgid="2366999897816894536">"Afficher dans la fenêtre de configuration rapide"</string>
@@ -2030,14 +2047,35 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Réveillent l\'appareil en arrière-plan"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Demandent la position fréquemment"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> applications se comportent de manière anormale"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"La pile est en bon état"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Les applications se comportent normalement"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Pile faible"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"La pile ne peut pas fournir une autonomie suffisante"</string>
+    <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Activer le gestionnaire de pile intelligent"</string>
+    <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Activer ce mode pour optimiser l\'utilisation de la pile"</string>
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
     <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Téléphone utilisé intensément"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Tablette utilisée intensément"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Appareil utilisé intensément"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Utilisation approximative depuis la dernière charge complète : <xliff:g id="HOUR">%1$s</xliff:g>"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Votre téléphone a été utilisé intensément, et cela a consommé beaucoup d\'énergie. Sa pile fonctionne correctement.\n\nVotre téléphone a été utilisé pendant environ <xliff:g id="HOUR">%1$s</xliff:g> depuis sa dernière charge complète.\n\n Usage total :"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Votre tablette a été utilisée intensément, et cela a consommé beaucoup d\'énergie. Sa pile fonctionne correctement.\n\nVotre tablette a été utilisée pendant environ <xliff:g id="HOUR">%1$s</xliff:g> depuis sa dernière charge complète.\n\n Usage total :"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Votre appareil a été utilisé intensément, et cela a consommé beaucoup d\'énergie. Sa pile fonctionne correctement.\n\nVotre appareil a été utilisé pendant environ <xliff:g id="HOUR">%1$s</xliff:g> depuis sa dernière charge complète.\n\n Usage total :"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"Gestionnaire de pile intelligent"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"Gérer automatiquement la pile"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"Ajuster automatiquement la consommation d\'énergie des applications en fonction de l\'utilisation"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"Applications restreintes"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="one">%1$d application</item>
+      <item quantity="other">%1$d applications</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"Arrêter l\'application?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Votre téléphone n\'arrive pas à gérer sa pile normalement, car l\'application <xliff:g id="APP">%1$s</xliff:g> le maintient activé.\n\nPour y remédier, vous pouvez arrêter l\'application.\n\nSi le problème persiste, vous devrez peut-être désinstaller l\'application pour améliorer les performances de la pile."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Votre tablette n\'arrive pas à gérer sa pile normalement, car l\'application <xliff:g id="APP">%1$s</xliff:g> la maintient activée.\n\nPour y remédier, vous pouvez arrêter l\'application.\n\nSi le problème persiste, vous devrez peut-être désinstaller l\'application pour améliorer les performances de la pile."</string>
@@ -2146,6 +2184,7 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Serveur multimédia"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Optimisation des applications"</string>
     <string name="battery_saver" msgid="8172485772238572153">"Économie d\'énergie"</string>
+    <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Utiliser le mode Économie d\'énergie"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Activer automatiquement"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Jamais"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"à <xliff:g id="PERCENT">%1$s</xliff:g> d\'autonomie restante"</string>
@@ -2366,6 +2405,7 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"Supprimer le compte?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"La suppression de ce compte entraînera la suppression de tous les messages, contacts et autres données de la tablette."</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"La suppression de ce compte entraînera la suppression de tous les messages, contacts et autres données du téléphone."</string>
+    <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"La suppression de ce compte entraînera la suppression de tous les messages, les contacts et les autres données de l\'appareil."</string>
     <string name="remove_account_failed" msgid="3901397272647112455">"Cette modification n\'est pas autorisée par votre administrateur"</string>
     <string name="provider_label" msgid="7724593781904508866">"Abonnements Push"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2890,8 +2930,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Bloquer dérangements visuels"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Autoriser les signaux visuels"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"Ajouter"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ACTIVER MAINTENANT"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"DÉSACTIVER MAINTENANT"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Activer maintenant"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Désactiver maintenant"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Le mode Ne pas déranger est activé jusqu\'à <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Le mode Ne pas déranger restera actif jusqu\'à ce que vous le désactiviez"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Le mode Ne pas déranger a été activé par une règle (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
@@ -2930,7 +2970,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Notifications de l\'appli"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Catégorie de notifications"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"Groupe de notifications"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"Importance"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"Comportement"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"Autoriser le son"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Ne jamais afficher les notifications"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Aucun son ni interruption visuelle"</string>
@@ -2948,6 +2988,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Importance moyenne"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importance élevée"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"Importance urgente"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"Afficher les notifications"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Assistant des notifications"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Accès aux notifications"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"L\'accès aux notifications du profil professionnel est bloqué"</string>
@@ -2978,9 +3019,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Accès à « Ne pas déranger »"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Aune application installée n\'a demandé l\'accès au mode « Ne pas déranger »"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Chargement des applications en cours..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android empêche les notifications de cette application de s\'afficher sur cet appareil"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android empêche cette catégorie de notifications de s\'afficher sur cet appareil"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android empêche ce groupe de notifications de s\'afficher sur cet appareil"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"À votre demande, Android empêche les notifications de cette application de s\'afficher sur cet appareil"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"À votre demande, Android empêche cette catégorie de notifications de s\'afficher sur cet appareil"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"À votre demande, Android empêche ce groupe de notifications de s\'afficher sur cet appareil"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Catégories"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Autre"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3559,31 +3600,8 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"Paramètres rapides, tuiles de concepteur"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"Nous sommes là pour vous aider"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Nous sommes là pour vous aider, 24 heures sur 24, sept jours sur sept"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Nous sommes là pour vous aider, 24 heures sur 24, sept jours sur sept"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"Notre équipe d\'assistance est là pour répondre à toutes vos questions"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Notre équipe d\'assistance est disponible 24 heures sur 24, sept jours sur sept"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Effectuez une recherche dans l\'aide ou revenez pendant les heures d\'ouverture du service d\'assistance (heure locale) :&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Heures d\'ouverture du service d\'assistance téléphonique (heure locale) &lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Effectuer une recherche dans l\'aide ou lire les conseils et astuces"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"Assistance :"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"Vous voyagez à l\'étranger?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"Des frais d\'interurbain peuvent s\'appliquer"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Téléphone"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"Clavardage"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Découvrir des conseils et des astuces"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Rechercher dans l\'aide et envoyer des commentaires"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"Communiquer avec l\'équipe d\'assistance"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Connexion"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"Vous n\'arrivez pas à vous connecter?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"Envoyer les données système"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Ne plus afficher"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"Effectuer la demande avec le compte"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"Ajouter un compte"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"Données sur le système"</string>
+    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Trace de fenêtre"</string>
+    <string name="layer_trace_quick_settings_title" msgid="2447147947568109649">"Trace de couche"</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>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Autoriser les recherches de contacts dans votre organisation à identifier les appelants et les contacts"</string>
@@ -3599,11 +3617,11 @@
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> seconde</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> secondes</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Durée d\'attente : environ <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Gérer l\'espace de stockage"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Pour vous aider à libérer de l\'espace, le Gestionnaire de stockage supprime les photos et les vidéos sauvegardées sur votre appareil."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Supprimer les photos et les vidéos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Gestionnaire de stockage"</string>
+    <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Utiliser le gestionnaire de stockage"</string>
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatique"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuel"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Libérer de l\'espace maintenant"</string>
@@ -3769,8 +3787,8 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Découvrez votre nouvelle tablette"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Découvrez votre nouvel appareil"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Cette fonctionnalité n\'est pas accessible sur cet appareil."</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
-    <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
-    <skip />
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forcer les mesures GNSS complètes"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Faire le suivi de toutes les constellations et les fréquences GNSS sans cycle de tâches"</string>
+    <string name="storage_access" msgid="8905018810338984531">"Accès au répertoire de stockage"</string>
+    <string name="keywords_storage_access" msgid="3708874088152933579">"stockage accès évalué répertoire"</string>
 </resources>
diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml
index e50afeb..a1ea9c4 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"નબળું"</item>
     <item msgid="2042505933058940139">"નબળી"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"60 દિવસથી વધુ જૂના"</item>
     <item msgid="5692284879054004388">"90 દિવસથી વધુ જૂના"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"નેટવર્ક પસંદગીનો ઉપયોગ કરો"</item>
+    <item msgid="8745603368609022803">"મીટર કરેલ તરીકે ગણો"</item>
+    <item msgid="2266114985518865625">"મીટર ન કરેલ તરીકે ગણો"</item>
+  </string-array>
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 9099dcf..8d40cfb 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"તમારા ઉપકરણો"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"નવા ઉપકરણ સાથે જોડાણ બનાવો"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"ઉપકરણને જોડી બનાવવા અને અન્ય બ્લૂટૂથ ઉપકરણો સાથે કનેક્ટ કરવાની મંજૂરી આપો"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"બેંડમાં રિંગ વાગવાનું બંધ કરો"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"બ્લૂટૂથ હૅડસેટ પર કસ્ટમ ફોન રિંગટોન વગાડશો નહીં"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"હાલમાં કનેક્ટ કરેલ છે"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"સાચવેલ ઉપકરણો"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"ઉપકરણ ઉમેરો"</string>
@@ -330,6 +332,16 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"તારીખ સેટ કરો"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"મૂળાક્ષરો પ્રમાણે સૉર્ટ કરો"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"સમય ઝોન પ્રમાણે સૉર્ટ કરો"</string>
+    <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+    <skip />
+    <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+    <skip />
+    <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+    <skip />
     <string name="date_picker_title" msgid="1338210036394128512">"તારીખ"</string>
     <string name="time_picker_title" msgid="483460752287255019">"સમય"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"આપમેળે લૉક"</string>
@@ -348,6 +360,8 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"પ્રોફાઇલ માહિતી"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"એકાઉન્ટ્સ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"સ્થાન"</string>
+    <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+    <skip />
     <string name="account_settings_title" msgid="626177544686329806">"એકાઉન્ટ્સ"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"સુરક્ષા અને સ્થાન"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"એન્ક્રિપ્શન અને ઓળખપત્રો"</string>
@@ -691,6 +705,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"સ્પીકર ફોન તરીકે"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"સંગીત અને મીડિયા માટે"</string>
     <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="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>
@@ -705,6 +721,8 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"નામ"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+    <skip />
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g>, વાઇ-ફાઇ ચાલુ કરવા માગે છે"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g>, વાઇ-ફાઇ બંધ કરવા માગે છે"</string>
@@ -722,6 +740,8 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"વાઇ-ફાઇ"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"વાઇ-ફાઇ ચાલુ કરો"</string>
     <string name="wifi_settings" msgid="29722149822540994">"વાઇ-ફાઇ"</string>
+    <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+    <skip />
     <string name="wifi_settings_category" msgid="8719175790520448014">"વાઇ-ફાઇ સેટિંગ્સ"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"વાઇ-ફાઇ"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"વાયરલેસ ઍક્સેસ બિંદુઓને સેટ અને સંચાલિત કરો"</string>
@@ -833,7 +853,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ઉપલબ્ધ)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"તમારો નેટવર્ક પાસવર્ડ દાખલ કરો"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"કૅરિઅર વાઇ-ફાઇ નેટવર્ક"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> દ્વારા કનેક્ટ કરો"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> દ્વારા કનેક્ટ કરો"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"સ્થાન સચોટતા બહેતર બનાવવા માટે અને અન્ય હેતુઓ માટે, વાઇ-ફાઇ બંધ હોય ત્યારે પણ <xliff:g id="APP_NAME">%1$s</xliff:g> નેટવર્ક સ્કેનિંગ ચાલુ કરવા માંગે છે.\n\nસ્કેન કરવા માંગે છે તે બધી ઍપ્લિકેશનો માટે આને મંજૂરી આપીએ?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"આ બંધ કરવા માટે, ઓવરફ્લો મેનૂમાં વિગતવાર પર જાઓ."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"મંજૂરી આપો"</string>
@@ -909,10 +929,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP બૅન્ડ"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"તમારા અન્ય ઉપકરણો માટે વાઇ-ફાઇ નેટવર્ક બનાવવા હૉટસ્પૉટનો ઉપયોગ કરો. હૉટસ્પૉટ તમારા મોબાઇલ ડેટા કનેક્શનનો ઉપયોગ કરીને ઇન્ટરનેટ પૂરું પાડે છે. વધારાનો મોબાઇલ ડેટા શુલ્ક લાગુ થઈ શકે છે."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ઍપ્લિકેશનો નજીકના ઉપકરણો સાથે કન્ટેન્ટ શેર કરવા માટે હૉટસ્પૉટ બનાવી શકે છે."</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"હૉટસ્પૉટ આપમેળે બંધ કરો"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"જો કોઈ ઉપકરણો કનેક્ટ થયેલા ન હશે તો વાઇ-ફાઇ હૉટસ્પૉટ બંધ થઈ જશે"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"હૉટસ્પૉટ ચાલુ કરી રહ્યું છે…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"હૉટસ્પૉટ બંધ કરી રહ્યું છે…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> સક્રિય છે"</string>
@@ -961,6 +979,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"કટોકટીનું સરનામું"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"જ્યારે તમે વાઇ-ફાઇનો ઉપયોગ કરીને કોઈ કટોકટીનો કૉલ કરો તો તેનો તમારા સ્થાન તરીકે ઉપયોગ કરવામાં આવશે"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958">"ખાનગી DNS સુવિધા વિશે "<annotation id="url">"વધુ જાણો"</annotation></string>
     <string name="display_settings_title" msgid="1708697328627382561">"ડિસ્પ્લે"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ધ્વનિ"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"વૉલ્યૂમ્સ"</string>
@@ -1308,6 +1327,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"તમારું નવું <xliff:g id="NAME">^1</xliff:g> કાર્ય કરી રહ્યું છે. \n\nઆ ઉપકરણ પર ફોટો, ફાઇલો અને ઍપ્લિકેશન ડેટા ખસેડવા માટે, સેટિંગ્સ &gt; સ્ટોરેજ પર જાઓ."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> ને ખસેડો"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> ને તેના ડેટાને <xliff:g id="NAME_0">^2</xliff:g> પર ખસેડવામાં થોડો જ સમય લાગશે. જ્યાં સુધી ખસેડવાનું પૂર્ણ ન થાય ત્યાં સુધી તમે એપ્લિકેશનનો ઉપયોગ કરી શકશો નહીં. \n\nખસેડવા દરમિયાન <xliff:g id="NAME_1">^2</xliff:g> ને દૂર કરશો નહીં."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"ડેટા ખસેડવા માટે તમારે વપરાશકર્તા <xliff:g id="APP">^1</xliff:g> અનલૉક કરવાની જરૂર છે."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> ને ખસેડી રહ્યાં છે…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"ખસેડવા દરમિયાન <xliff:g id="NAME">^1</xliff:g> ને દૂર કરશો નહીં. \n\nજ્યાં સુધી ખસેડવાનું પૂર્ણ થતું નથી ત્યાં સુધી આ ઉપકરણ પરની <xliff:g id="APP">^2</xliff:g> ઍપ્લિકેશન ઉપલબ્ધ થશે નહીં."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ખસેડવાનું રદ કરો"</string>
@@ -1468,6 +1488,8 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"સ્થાન સ્ત્રોતો"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"ટેબ્લેટ વિશે"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"ફોન વિશે"</string>
+    <!-- no translation found for about_settings (6717640957897546887) -->
+    <skip />
     <string name="about_settings" product="emulator" msgid="221313099578564438">"ઇમ્યુલેટ કરેલ ઉપકરણ વિશે"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"કાનૂની માહિતી, સ્થિતિ, સોફ્ટવેર સંસ્કરણ જુઓ"</string>
     <string name="legal_information" msgid="5769301644270604095">"કાનૂની માહિતી"</string>
@@ -1575,6 +1597,8 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"બધી <xliff:g id="COUNT">%1$d</xliff:g> ઍપ્લિકેશન જુઓ"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"તમારું ટૅબ્લેટ અને વ્યક્તિગત ડેટા અજાણી ઍપ્લિકેશનોના હુમલા પ્રતિ વધુ સંવેદનશીલ છે. આ સ્રોત પરથી ઍપ્લિકેશનો ઇન્સ્ટૉલ કરીને તમે સંમત થાઓ છો કે તેમનો ઉપયોગ કરવાના પરિણામે તમારા ટૅબ્લેટને થતી કોઈ પણ ક્ષતિ કે ડેટાના નુકસાન માટે તમે જવાબદાર છો."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"તમારો ફોન અને વ્યક્તિગત ડેટા અજાણી ઍપ્લિકેશનોના હુમલા પ્રતિ વધુ સંવેદનશીલ છે. આ સ્રોત પરથી ઍપ્લિકેશનો ઇન્સ્ટૉલ કરીને તમે સંમત થાઓ છો કે તેમનો ઉપયોગ કરવાના પરિણામે તમારા ફોનને થતી કોઈ પણ ક્ષતિ કે ડેટાના નુકસાન માટે તમે જવાબદાર છો."</string>
+    <!-- no translation found for install_all_warning (3648003301476423145) -->
+    <skip />
     <string name="advanced_settings" msgid="1777249286757067969">"વિગતવાર સેટિંગ્સ"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"વધુ સેટિંગ્સ વિકલ્પો સક્ષમ કરો"</string>
     <string name="application_info_label" msgid="5736524913065714880">"ઍપ્લિકેશન માહિતી"</string>
@@ -1874,6 +1898,12 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"કાર્યપ્રદર્શનને અસર થઈ શકે છે"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"પોઇન્ટર અટકે પછી ક્લિક કરો"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ક્લિક કરતાં પહેલાં વિલંબ"</string>
+    <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+    <skip />
+    <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+    <skip />
+    <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+    <skip />
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ચાલુ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"બંધ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"ઝડપી સેટિંગ્સમાં બતાવો"</string>
@@ -2030,14 +2060,37 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ઉપકરણને પૃષ્ઠભૂમિમાં સક્રિય કરે છે"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"વારંવાર સ્થાનની વિનંતી કરે છે"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ઍપ્લિકેશનો વિચિત્ર રીતે કાર્ય કરે છે"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"બૅટરી સારી અવસ્થામાં છે"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"ઍપ સામાન્ય રીતે વર્તન કરે છે"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"બેટરીની ક્ષમતા ઓછી છે"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"આ બૅટરી બહુ લાંબી ચાલશે નહીં"</string>
+    <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+    <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"ફોનનો ભારે ઉપયોગ કર્યો"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"ટૅબ્લેટનો ભારે ઉપયોગ કર્યો"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"ઉપકરણનો ભારે ઉપયોગ કર્યો"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"છેલ્લે સંપૂર્ણ ચાર્જ કર્યાં પછી લગભગ <xliff:g id="HOUR">%1$s</xliff:g> કલાકનો ઉપયોગ"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"તમારા ફોનનો ભારે ઉપયોગ કરવામાં આવ્યો હતો અને તેને લીધે બૅટરીનો વપરાશ વધુ થયો હતો. તમારી બૅટરી સામાન્ય રીતે વર્તી રહી છે.\n\n છેલ્લે સંપૂર્ણ ચાર્જ કર્યાં પછી તમારા ફોનનો ઉપયોગ લગભગ <xliff:g id="HOUR">%1$s</xliff:g> કલાક કરવામાં આવ્યો હતો.\n\n કુલ વપરાશ:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"તમારા ટૅબ્લેટનો ભારે ઉપયોગ કરવામાં આવ્યો હતો અને તેને લીધે બૅટરીનો વપરાશ વધુ થયો હતો. તમારી બૅટરી સામાન્ય રીતે વર્તી રહી છે.\n\n છેલ્લે સંપૂર્ણ ચાર્જ કર્યાં પછી તમારા ટૅબ્લેટનો ઉપયોગ લગભગ <xliff:g id="HOUR">%1$s</xliff:g> કલાક કરવામાં આવ્યો હતો.\n\n કુલ વપરાશ:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"તમારા ઉપકરણનો ભારે ઉપયોગ કરવામાં આવ્યો હતો અને તેને લીધે બૅટરીનો વપરાશ વધુ થયો હતો. તમારી બૅટરી સામાન્ય રીતે વર્તી રહી છે.\n\n છેલ્લે સંપૂર્ણ ચાર્જ કર્યાં પછી તમારા ઉપકરણનો ઉપયોગ લગભગ <xliff:g id="HOUR">%1$s</xliff:g> કલાક કરવામાં આવ્યો હતો.\n\n કુલ વપરાશ:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"સ્માર્ટ બૅટરી મેનેજર"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"આપમેળે-મેનેજ થતી બૅટરી"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"વપરાશના આધારે ઍપ દ્વારા આપમેળે પાવર વપરાશ ઓછો-વધતો કરવામાં આવે છે"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"પ્રતિબંધિત ઍપ"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="one">%1$d ઍપ</item>
+      <item quantity="other">%1$d ઍપ</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"ઍપ્લિકેશન બંધ કરીએ?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"તમારો ફોન સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતો નથી કારણ કે <xliff:g id="APP">%1$s</xliff:g> તમારા ફોનને સક્રિય રાખે કરે છે.\n\nઆ સમસ્યાનું સમાધાન લાવવા માટે, તમે ઍપ્લિકેશનને બંધ કરી શકો છો.\n\n જો આમ થવાનું ચાલુ રહે, તો બૅટરીનું કાર્યપ્રદર્શન બહેતર બનાવવા માટે તમને ઍપ્લિકેશનને અનઇન્સ્ટૉલ કરવાની જરૂરી પડી શકે છે."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"તમારું ટૅબ્લેટ સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતું નથી કારણ કે <xliff:g id="APP">%1$s</xliff:g> તમારા ટૅબ્લેટને સક્રિય રાખે કરે છે.\n\nઆ સમસ્યાનું સમાધાન લાવવા માટે, તમે ઍપ્લિકેશનને બંધ કરી શકો છો.\n\n જો આમ થવાનું ચાલુ રહે, તો બૅટરીનું કાર્યપ્રદર્શન બહેતર બનાવવા માટે તમને ઍપ્લિકેશનને અનઇન્સ્ટૉલ કરવાની જરૂરી પડી શકે છે."</string>
@@ -2146,6 +2199,8 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"ઍપ્લિકેશન ઓપ્ટિમાઇઝેશન"</string>
     <string name="battery_saver" msgid="8172485772238572153">"બૅટરી સેવર"</string>
+    <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+    <skip />
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"આપમેળે ચાલુ કરો"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"ક્યારેય નહીં"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> બૅટરી પર"</string>
@@ -2366,6 +2421,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"એકાઉન્ટ દૂર કરીએ?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"આ એકાઉન્ટને દૂર કરવું તેનાં તમામ સંદેશા, સંપર્કો અને ટેબ્લેટમાંના અન્ય ડેટાને કાઢી નાંખશે!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"આ એકાઉન્ટને દૂર કરવું તેનાં તમામ સંદેશા, સંપર્કો અને ફોનમાંના અન્ય ડેટાને કાઢી નાંખશે!"</string>
+    <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+    <skip />
     <string name="remove_account_failed" msgid="3901397272647112455">"તમારા વ્યવસ્થાપકે આ ફેરફારની મંજૂરી આપી નથી"</string>
     <string name="provider_label" msgid="7724593781904508866">"સબ્સ્ક્રિપ્શન્સ પુશ કરો"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2890,8 +2947,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"દૃશ્ય વિક્ષેપોને બ્લૉક કરો"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"વિઝ્યુઅલ સંકેતોને મંજૂરી આપો"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"ઉમેરો"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"હમણાં ચાલુ કરો"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"હમણાં બંધ કરો"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"હમણાં ચાલુ કરો"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"હમણાં બંધ કરો"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"ખલેલ પાડશો નહીં મોડ <xliff:g id="FORMATTED_TIME">%s</xliff:g> સુધી ચાલુ છે"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"ખલેલ પાડશો નહીં મોડને તમે જ્યાં સુધી બંધ નહીં કરો ત્યાં સુધી તે ચાલુ રહેશે."</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"ખલેલ પાડશો નહીં મોડ એક <xliff:g id="RULE_NAME">%s</xliff:g> નિયમ દ્વારા આપમેળે ચાલુ કરવામાં આવ્યું હતું"</string>
@@ -2930,7 +2987,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"ઍપ્લિકેશન સૂચનાઓ"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"નોટિફિકેશન શ્રેણી"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"નોટિફિકેશનની કૅટેગરીના જૂથો"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"મહત્વ"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"વર્તણૂક"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"ધ્વનિની મંજૂરી આપો"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"સૂચનાઓ ક્યારેય બતાવશો નહીં"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"કોઈ અવાજ અથવા વિઝ્યુઅલ અવરોધ નહીં"</string>
@@ -2948,6 +3005,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"સામાન્ય મહત્ત્વની"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"ખૂબ જ મહત્ત્વની"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"તાત્કાલિક મહત્ત્વની"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"નોટિફિકેશન બતાવો"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"નોટિફિકેશન સહાયક"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"નોટિફિકેશન ઍક્સેસ"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"કાર્યાલયની પ્રોફાઇલની સૂચનાઓનો ઍક્સેસ બ્લૉક કરવામાં આવ્યો છે"</string>
@@ -2978,9 +3036,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"ખલેલ પાડશો નહીં નો ઍક્સેસ"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"કોઇ ઇન્સ્ટોલ કરેલ એપ્લિકેશન્સએ ખલેલ પાડશો નહીં ઍક્સેસ કરવાની વિનંતી કરી નથી"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ઍપ્લિકેશનો લોડ કરી રહ્યું છે..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"આ ઍપ્લિકેશનની નોટિફિકેશન આ ઉપકરણ પર પ્રદર્શિત થતા Android અવરોધિત કરી રહ્યું છે"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"આ કૅટેગરીની નોટિફિકેશન આ ઉપકરણ પર પ્રદર્શિત થતા Android અવરોધિત કરી રહ્યું છે"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android આ નોટિફિકેશનના જૂથોને આ ઉપકરણ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનને આ ઉપકરણ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનની કૅટેગરીને આ ઉપકરણ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનના જૂથોને આ ઉપકરણ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
     <string name="notification_channels" msgid="5346841743182627500">"કૅટેગરીઓ"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"અન્ય"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3559,31 +3617,10 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"બહુવિધ ઉપકરણો સાથે કનેક્ટ કરેલું છે"</string>
     <string name="demo_mode" msgid="2798762752209330277">"સિસ્ટમ UI ડેમો મોડ"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"ઝપડી સેટિંગ્સ વિકાસકર્તા ટાઇલ"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"સહાય કરવા માટે અમે અહીં ઉપલબ્ધ છીએ"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"અમે તમારા માટે 24/7 અહીં ઉપલબ્ધ છીએ"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"અમે તમારા માટે 24/7 અહીં ઉપલબ્ધ છીએ"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"કોઈપણ સમસ્યાના સમાધાનમાં સહાય કરવા માટે અમારી સમર્થન ટીમ અહીં ઉપલબ્ધ છે"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"અમારી સમર્થન ટીમ આખો દિવસ, દરરોજ ઉપલબ્ધ છે"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"સહાયમાં શોધો અથવા સમર્થન સમય (સ્થાનિક સમય) દરમિયાન પાછા આવો:&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"ફોન માટેનો સમર્થન સમય (સ્થાનિક સમય)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"સહાય શોધો અથવા ટિપ્સ અને યુક્તિઓનું અન્વેષણ કરો"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"આ માટે સમર્થન:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"વિદેશની મુસાફરી કરી રહ્યાં છો?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"આંતરરાષ્ટ્રીય શુલ્ક લાગુ થઈ શકે"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"ફોન"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"ચેટ"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"ટિપ્સ અને યુક્તિઓનું અન્વેષણ કરો"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"સહાય શોધો અને પ્રતિસાદ મોકલો"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"સમર્થનનો સંપર્ક કરો"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"સાઇન ઇન કરો"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"શું સાઇન ઇન કરી શકતાં નથી?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"સિસ્ટમ માહિતી મોકલો"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"ફરી બતાવશો નહીં"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"આ તરીકે વિનંતી કરી રહ્યું છે"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"એકાઉન્ટ ઉમેરો"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"સિસ્ટમ માહિતી"</string>
+    <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+    <skip />
+    <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+    <skip />
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"કાર્યાલયની પ્રોફાઇલની સેટિંગ્સ"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"સંપર્ક શોધ"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"કૉલર્સ અને સંપર્કોને ઓળખવા માટે તમારી સંસ્થા દ્વારા સંપર્ક શોધની મંજૂરી આપો"</string>
@@ -3599,11 +3636,12 @@
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> સેકન્ડ</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> સેકન્ડ</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> રાહ જુઓ"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"સ્ટોરેજનું સંચાલન કરો"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"સ્ટોરેજ સ્થાન ખાલી કરવામાં સહાય માટે, સ્ટોરેજ સંંચાલક તમારા ઉપકરણમાંથી બેક અપ લીધેલા ફોટો અને વિડિઓઝને દૂર કરો."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ફોટો અને વિડિઓઝ દૂર કરો"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"સ્ટોરેજ સંચાલક"</string>
+    <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+    <skip />
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"સ્વચાલિત"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"મેન્યુઅલ"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"હમણાં સ્થાન ખાલી કરો"</string>
@@ -3769,8 +3807,10 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"તમારા નવા ટેબ્લેટની ઓળખ મેળવો"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"તમારા નવા ઉપકરણની ઓળખ મેળવો"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"આ ઉપકરણ પર આ સુવિધા ઉપલબ્ધ નથી"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"સંપૂર્ણ GNSS માપને લાગુ કરો"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"કોઈપણ ડ્યૂટી-સાઈક્લિંગ વગર બધા GNSS તારામંડળો અને આવર્તનો ટ્રૅક કરો"</string>
+    <!-- no translation found for storage_access (8905018810338984531) -->
     <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+    <!-- no translation found for keywords_storage_access (3708874088152933579) -->
     <skip />
 </resources>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 3e237ea..3051579 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"कमज़ोर"</item>
     <item msgid="2042505933058940139">"कमज़ोर"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"60 दिन से अधिक पुराने"</item>
     <item msgid="5692284879054004388">"90 दिन से अधिक पुराने"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"अपनी पसंद का नेटवर्क इस्तेमाल करें"</item>
+    <item msgid="8745603368609022803">"इस कनेक्शन में डेटा से जुड़ी पाबंदी है"</item>
+    <item msgid="2266114985518865625">"इस कनेक्शन में डेटा से जुड़ी पाबंदी नहीं है"</item>
+  </string-array>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index a34f498..39d66d3 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"आपके डिवाइस"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"नया डिवाइस जोड़ें"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"डिवाइस को ब्लूटूथ डिवाइस से जुड़ने और कनेक्ट होने की मंज़ूरी दें"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"\'इन-बैंड रिंगिंग\' (पसंद वाली रिंगटोन) बंद करें"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"फ़ोन पर मौजूद पसंद के मुताबिक बनी रिंगटोन ब्लूटूथ हेडसेट पर न चलाएं"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"इंटरनेट से जुड़े हुए डिवाइस"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"सेव किए गए डिवाइस"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"डिवाइस जोड़ें"</string>
@@ -330,6 +332,16 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"दिनांक सेट करें"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"वर्णानुक्रम में क्रमित करें"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"समय क्षेत्र द्वारा क्रमित करें"</string>
+    <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+    <skip />
+    <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+    <skip />
+    <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+    <skip />
     <string name="date_picker_title" msgid="1338210036394128512">"तारीख"</string>
     <string name="time_picker_title" msgid="483460752287255019">"समय"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"अपने आप लॉक करें"</string>
@@ -348,6 +360,8 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"प्रोफ़ाइल की जानकारी"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"खाते"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"जगह"</string>
+    <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+    <skip />
     <string name="account_settings_title" msgid="626177544686329806">"खाते"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"सुरक्षा और जगह"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"सुरक्षित करना और क्रेडेंशियल"</string>
@@ -691,6 +705,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"स्‍पीकर फ़ोन के रूप में"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"संगीत और मीडिया के लिए"</string>
     <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="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>
@@ -705,6 +721,8 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"नाम"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+    <skip />
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> वाई-फ़ाई को चालू करना चाहता है"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> वाई-फ़ाई को बंद करना चाहता है"</string>
@@ -722,6 +740,8 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"वाई-फ़ाई"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"वाई-फ़ाई  चालू करें"</string>
     <string name="wifi_settings" msgid="29722149822540994">"वाई-फ़ाई"</string>
+    <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+    <skip />
     <string name="wifi_settings_category" msgid="8719175790520448014">"वाई-फ़ाई सेटिंग"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"वाई-फ़ाई"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"वायरलेस पहुंच बिंदुओं को सेट अप और प्रबंधित करें"</string>
@@ -833,7 +853,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS उपलब्‍ध)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"अपना नेटवर्क पासवर्ड डालें"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी वाई-फ़ाई नेटवर्क"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> से कनेक्ट करें"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> से कनेक्ट करें"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"जगह की सटीकता को बेहतर बनाने और दुसरे कामों के लिए, Wi-Fi बंद होने पर भी <xliff:g id="APP_NAME">%1$s</xliff:g> नेटवर्क को स्कैन करना चालू करना चाहता है.\n\nउन सभी ऐप को इसकी अनुमति दें जो स्कैन करना चाहते हैं?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"इसे बंद करने के लिए, ओवरफ़्लो मेन्यू में बेहतर पर जाएं."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"अनुमति दें"</string>
@@ -909,10 +929,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP बैंड"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"अपने दूसरे डिवाइस के लिए हॉटस्पॉट का इस्तेमाल करके वाई-फ़ाई नेटवर्क बनाएं. हॉटस्पॉट आपके मोबाइल डेटा कनेक्शन के ज़रिए इंटरनेट की सुविधा देता है. मोबाइल डेटा के लिए अतिरिक्त भुगतान करना पड़ सकता है."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ऐप्लिकेशन आस-पास के डिवाइस से सामग्री साझा करने के लिए कोई हॉटस्पॉट बना सकते हैं."</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"हॉटस्पॉट अपने आप बंद करें"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"कोई डिवाइस कनेक्ट नहीं होने पर, वाई-फ़ाई हॉटस्पॉट बंद हो जाएगा"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"हॉटस्‍पॉट को चालू किया जा रहा है…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"हॉटस्‍पॉट को बंद किया जा रहा है…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> सक्रिय है"</string>
@@ -961,6 +979,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"आपातकालीन पता"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"जब आप वाई-फ़ाई पर आपातकालीन कॉल करते हैं, तब आपकी मौजूदा जगह को आपके पते के तौर पर इस्तेमाल किया जाता है"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958">"निजी डीएनएस की सुविधाओं के बारे में "<annotation id="url">"ज़्यादा जानें"</annotation></string>
     <string name="display_settings_title" msgid="1708697328627382561">"स्क्रीन सेटिंग देखें"</string>
     <string name="sound_settings" msgid="5534671337768745343">"आवाज़"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"आवाज़"</string>
@@ -1308,6 +1327,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"आपका नया <xliff:g id="NAME">^1</xliff:g> काम कर रहा है. \n\nफ़ोटो, फ़ाइलों और ऐप डेटा को इस डिवाइस में ले जाने के लिए, सेटिंग &gt; मेमोरी पर जाएं."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> को ले जाएं"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> और उसके डेटा को <xliff:g id="NAME_0">^2</xliff:g> में ले जाने में कुछ ही समय लगेगा. ले जाने का काम पूर्ण होने तक आप ऐप का उपयोग नहीं कर पाएंगे. \n\nले जाने के दौरान <xliff:g id="NAME_1">^2</xliff:g> को ना निकालें."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"उपयोगकर्ता <xliff:g id="APP">^1</xliff:g> को अनलॉक करके ही डेटा लाया या ले जाया जा सकता है."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> को ले जाया जा रहा है…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"ले जाने के दौरान <xliff:g id="NAME">^1</xliff:g> को ना निकालें. \n\nइस डिवाइस में मौजूद <xliff:g id="APP">^2</xliff:g> ले जाने का काम पूर्ण होने तक ऐप उपलब्ध नहीं रहेगा."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ले जाना रोकें"</string>
@@ -1468,6 +1488,8 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"स्‍थानीय स्रोत"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"टैबलेट के बारे में"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"फ़ोन के बारे में"</string>
+    <!-- no translation found for about_settings (6717640957897546887) -->
+    <skip />
     <string name="about_settings" product="emulator" msgid="221313099578564438">"एम्युलेट किए गए डिवाइस के बारे में"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"क़ानूनी जानकारी, स्‍थिति, सॉफ़्टवेयर वर्शन देखें"</string>
     <string name="legal_information" msgid="5769301644270604095">"कानूनी जानकारी"</string>
@@ -1537,7 +1559,7 @@
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"आकार रिकॉर्ड किया गया"</string>
     <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"पुष्टि के लिए आकार को फिर से बनाएं"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"आपका नया अनलॉक आकार"</string>
-    <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"दोबारा पूछें"</string>
+    <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"पुष्टि करें"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"पुन: आरेखित करें"</string>
     <string name="lockpattern_retry_button_text" msgid="3480423193273588166">"साफ़ करें"</string>
     <string name="lockpattern_continue_button_text" msgid="4723771754714471410">"जारी रखें"</string>
@@ -1575,6 +1597,8 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"सभी <xliff:g id="COUNT">%1$d</xliff:g> ऐप देखें"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"आपके टैबलेट और व्यक्तिगत डेटा पर अनजान ऐप्लिकेशन की ओर से हमला किए जाने का जोखिम ज़्यादा है. इस स्रोत से आने वाले ऐप्लिकेशन इंस्टॉल करके, आप सहमति देते हैं कि उनके उपयोग के कारण आपके टैबलेट को होने वाले किसी भी नुकसान या डेटा की हानि के लिए आप ही ज़िम्मेदार हैं."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"आपके फ़ोन और व्यक्तिगत डेटा पर अनजान ऐप्लिकेशन की ओर से हमला किए जाने का जोखिम ज़्यादा है. इस स्रोत से आने वाले ऐप्लिकेशन इंस्टॉल करके, आप सहमति देते हैं कि उनके उपयोग के कारण आपके फ़ोन को होने वाले किसी भी नुकसान या डेटा की हानि के लिए आप ही ज़िम्मेदार हैं."</string>
+    <!-- no translation found for install_all_warning (3648003301476423145) -->
+    <skip />
     <string name="advanced_settings" msgid="1777249286757067969">"बेहतर सेटिंग"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"और सेटिंग विकल्‍प चालू करें"</string>
     <string name="application_info_label" msgid="5736524913065714880">"ऐप की जानकारी"</string>
@@ -1874,6 +1898,12 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"डिसप्ले पर असर पड़ सकता है"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"पॉइंटर के रुकने के बाद क्लिक करें"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"क्लिक करने से पहले का विलंब"</string>
+    <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+    <skip />
+    <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+    <skip />
+    <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+    <skip />
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"चालू"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"बंद"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"त्वरित सेटिंग में दिखाएं"</string>
@@ -2030,14 +2060,37 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"डिवाइस को बैकग्राउंड में सक्रिय करना"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"बार-बार जगह का अनुरोध कर रहा है"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ऐप्लिकेशन ठीक से काम नहीं कर रहे हैं"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"बैटरी अच्छी हालत में है"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"ऐप्लिकेशन सामान्य तरीके से काम कर रहे हैं"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"बहुत कम बैटरी बची है"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"बहुत कम बैटरी बची है"</string>
+    <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+    <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"फ़ोन का बहुत ज़्यादा इस्तेमाल किया गया"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"टैबलेट का बहुत ज़्यादा इस्तेमाल किया गया"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"डिवाइस का बहुत ज़्यादा इस्तेमाल किया गया"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"पिछली बार पूरा चार्ज किए जाने के बाद से लगभग <xliff:g id="HOUR">%1$s</xliff:g> के लिए इस्तेमाल किया गया"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"आपके फ़ोन का बहुत ज़्यादा इस्तेमाल किया गया और इस वजह से बैटरी की काफ़ी खपत हुई. बैटरी सामान्य रूप से काम कर रही है.\n\n पिछली बार पूरा चार्ज किए जाने के बाद से फ़ोन को लगभग <xliff:g id="HOUR">%1$s</xliff:g> के लिए इस्तेमाल किया गया.\n\n इस्तेमाल किए जाने का कुल समय:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"आपके टैबलेट का बहुत ज़्यादा इस्तेमाल किया गया और इस वजह से बैटरी की काफ़ी खपत हुई. बैटरी सामान्य रूप से काम कर रही है.\n\n पिछली बार पूरा चार्ज किए जाने के बाद से टैबलेट को लगभग <xliff:g id="HOUR">%1$s</xliff:g> के लिए इस्तेमाल किया गया.\n\n इस्तेमाल किए जाने का कुल समय:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"आपके डिवाइस का बहुत ज़्यादा इस्तेमाल किया गया और इस वजह से बैटरी की काफ़ी खपत हुई. बैटरी सामान्य रूप से काम कर रही है.\n\n पिछली बार पूरा चार्ज किए जाने के बाद से डिवाइस को लगभग <xliff:g id="HOUR">%1$s</xliff:g> के लिए इस्तेमाल किया गया.\n\n इस्तेमाल किए जाने का कुल समय:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"स्मार्ट बैटरी मैनेजर"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"अपने आप बैटरी का बेहतर इस्तेमाल करें"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"इस्तेमाल के हिसाब से, ऐप्लिकेशन के बैटरी इस्तेमाल करने में अपने आप बदलाव करें"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"पाबंदी वाले ऐप्लिकेशन"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="one">%1$d ऐप्लिकेशन</item>
+      <item quantity="other">%1$d ऐप्लिकेशन</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"ऐप्लिकेशन रोकना चाहते हैं?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"आपका फ़ोन बैटरी को सामान्य सामान्य तौर पर प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP">%1$s</xliff:g> उसे चालू रख रहा है.\n\nइस समस्या को ठीक करने के लिए, आप ऐप्लिकेशन को रोक सकते हैं.\n\nअगर ऐसा बार-बार हो रहा है, तो बैटरी का प्रदर्शन बेहतर करने के लिए आपको ऐप अनइंस्टॉल करना पड़ सकता है."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"आपका टैबलेट बैटरी को सामान्य सामान्य तौर पर प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP">%1$s</xliff:g> उसे चालू रख रहा है.\n\nइस समस्या को ठीक करने के लिए, आप ऐप को रोक सकते हैं.\n\nअगर ऐसा बार-बार हो रहा है, तो बैटरी का प्रदर्शन बेहतर करने के लिए आपको ऐप अनइंस्टॉल करना पड़ सकता है."</string>
@@ -2146,6 +2199,8 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"मीडिया सर्वर"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"ऐप्‍स ऑप्‍टिमाइज़ेशन"</string>
     <string name="battery_saver" msgid="8172485772238572153">"बैटरी सेवर"</string>
+    <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+    <skip />
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"अपने आप चालू करें"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"कभी नहीं"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> बैटरी होने पर"</string>
@@ -2366,6 +2421,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"खाता मिटाएं?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"यह खाता निकालने से, टैबलेट से खाते के सभी संदेश, संपर्क और अन्‍य डेटा हट जाएंगे!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"यह खाता निकालने से, फ़ोन से इसके सभी संदेश, संपर्क और अन्‍य डेटा हट जाएंगे!"</string>
+    <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+    <skip />
     <string name="remove_account_failed" msgid="3901397272647112455">"आपका व्यवस्थापक इस बदलाव की अनुमति नहीं देता"</string>
     <string name="provider_label" msgid="7724593781904508866">"पुश सदस्यता"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2890,8 +2947,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"मैसेज पर स्क्रीन चमकने से रोकें"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"संकेत दिखाए जाने की अनुमति दें"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"जोड़ें"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"अभी चालू करें"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"अभी बंद करें"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"अभी चालू करें"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"अभी बंद करें"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"\'परेशान न करें\' <xliff:g id="FORMATTED_TIME">%s</xliff:g> तक चालू है"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"\'परेशान न करें\' तब तक चालू रहेगा जब तक आप इसे बंद नहीं करते"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"(<xliff:g id="RULE_NAME">%s</xliff:g>) नियम से \'परेशान न करें\' अपने आप चालू हो गया था"</string>
@@ -2930,7 +2987,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"ऐप सूचनाएं"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"सूचना की श्रेणी"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"सूचना की श्रेणी"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"महत्‍व"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"व्यवहार"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"आवाज़ की अनुमति दें"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"सूचनाएं कभी न दिखाएं"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ध्वनि या दृश्य संबंधी कोई रुकावट नहीं"</string>
@@ -2948,6 +3005,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"मध्यम महत्व"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"बहुत अधिक महत्व"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"तत्काल महत्व"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"सूचनाएं दिखाएं"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"सूचना सहायक"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"सूचना का एक्सेस"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"कार्य प्रोफ़ाइल सूचना की पहुंच रोक दी गई है"</string>
@@ -2978,9 +3036,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"परेशान न करें एक्सेस"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"इंस्टॉल किए गए किसी भी ऐप ने परेशान ना करें सुविधा के इस्तेमाल का अनुरोध नहीं किया है"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ऐप्स लोड हो रहे हैं..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android इस ऐप की सूचनाओं को इस डिवाइस पर दिखाई देने से रोक रहा है"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android सूचना की इस श्रेणी को इस डिवाइस पर दिखाई देने से रोक रहा है"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android इस तरह की सूचनाओं को इस डिवाइस पर दिखाई देने से रोक रहा है"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"आपके अनुरोध पर, Android इस ऐप्लिकेशन की सूचनाओं को इस डिवाइस पर आने से रोक रहा है"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"आपके अनुरोध पर, Android इस श्रेणी की सूचनाओं को इस डिवाइस पर आने से रोक रहा है"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"आपके अनुरोध पर, Android इस तरह की सूचनाओं को इस डिवाइस पर आने से रोक रहा है"</string>
     <string name="notification_channels" msgid="5346841743182627500">"श्रेणियां"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"अन्य"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3222,9 +3280,9 @@
     <string name="system_default_app" msgid="3091113402349739037">"(सिस्टम डिफ़ॉल्ट)"</string>
     <string name="apps_storage" msgid="4353308027210435513">"ऐप मेमोरी"</string>
     <string name="usage_access" msgid="5479504953931038165">"उपयोग की एक्‍सेस"</string>
-    <string name="permit_usage_access" msgid="4012876269445832300">"उपयोग की ऐक्‍सेस की अनुमति दें"</string>
+    <string name="permit_usage_access" msgid="4012876269445832300">"डेटा का इस्तेमाल देखने की अनुमति दें"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"ऐप उपयोग की प्राथमिकताएं"</string>
-    <string name="usage_access_description" msgid="1352111094596416795">"इस्तेमाल की पहुंच (यूसेज एक्सेस), किसी ऐप को यह ट्रैक करने देता है कि आप कौन-कौन से एेप इस्तेमाल कर रहे हैं और उन्हें कितनी बार इस्तेमाल करते हैं. साथ ही आपकी मोबाइल और इंटरनेट सेवा देने वाली कंपनी, भाषा सेटिंग और अन्‍य जानकारी भी ट्रैक करने देती है."</string>
+    <string name="usage_access_description" msgid="1352111094596416795">"डेटा का इस्तेमाल देखने की अनुमति से कोई ऐप्लिकेशन यह ट्रैक कर पाता है कि आप कौनसे एेप्लिकेशन चला रहे हैं और उन्हें कितनी बार इस्तेमाल करते हैं. साथ ही, ऐप्लिकेशन आपकी मोबाइल और इंटरनेट सेवा देने वाली कंपनी, भाषा सेटिंग और दूसरी जानकारी पर नज़र रख पाता है."</string>
     <string name="memory_settings_title" msgid="7490541005204254222">"मेमोरी"</string>
     <string name="memory_details_title" msgid="8542565326053693320">"मेमोरी का विवरण"</string>
     <string name="always_running" msgid="6042448320077429656">"हमेशा चलने वाला (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3559,31 +3617,10 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"कई डिवाइस से कनेक्ट है"</string>
     <string name="demo_mode" msgid="2798762752209330277">"सिस्टम यूज़र इंटरफ़ेस (यूआई) डेमो मोड"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"त्वरित सेटिंग डेवलपर टाइल"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"सहायता के लिए हम यहां हैं"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"हम आपके लिए पूरे सप्ताह, हर समय यहां उपलब्ध हैं"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"हम आपके लिए पूरे सप्ताह, हर समय यहां उपलब्ध हैं"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"हमारी सहायता टीम किसी भी समस्या को हल करने के लिए यहां उपलब्ध है"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"हमारी सहायता टीम हर दिन, हर समय उपलब्ध रहती है"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"मदद ढूंढें या सहायता की अवधि (स्थानीय समय) के दौरान वापस आएं:&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"फ़ोन सहायता अवधि का समय (स्थानीय समय)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"मदद ढूंढें या सलाह और सुझाव तलाशें"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"इसके लिए समर्थन:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"विदेश यात्रा कर रहे हैं?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"अंतर्राष्‍ट्रीय शुल्क लागू हो सकते हैं"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"फ़ोन"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"चैट करें"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"सलाह और सुझाव के बारे में और जानें"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"मदद ढूंढें और सुझाव भेजें"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"सहायता से संपर्क करें"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"साइन इन करें"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"प्रवेश नहीं कर पा रहे हैं?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"सिस्टम की जानकारी भेजें"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"दोबारा ना दिखाएं"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"के तौर पर अनुरोध किया जा रहा है"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"खाता जोड़ें"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"सिस्टम की जानकारी"</string>
+    <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+    <skip />
+    <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+    <skip />
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"कार्य प्रोफ़ाइल सेटिंग"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"संपर्क सर्च"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"कॉल करने वालों (कॉलर) और संपर्कों की पहचान करने के लिए अपने संगठन को संपर्क खोजने दें"</string>
@@ -3599,11 +3636,12 @@
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> सेकंड</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> सेकंड</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> प्रतीक्षा करें"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"जगह प्रबंधित करें"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"मेमोरी में जगह खाली करने में मदद करने के लिए, मेमोरी प्रबंधक आपके डिवाइस से बैकअप ली गई फ़ोटो और वीडियो निकाल देता है."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"फ़ोटो और वीडियो निकालें"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"मेमोरी प्रबंधक"</string>
+    <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+    <skip />
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"स्वचालित"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"मैन्युअल"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"अभी स्पेस खाली करें"</string>
@@ -3769,8 +3807,10 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"अपने नए टैबलेट के बारे में अच्छी तरह जानें"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"अपने नए डिवाइस के बारे में अच्छी तरह जानें"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"यह सुविधा इस डिवाइस पर उपलब्ध नहीं है"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"GNSS माप को पूरी तरह लागू करें"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"बिना ड्यूटी-साइक्लिंग के GNSS की सभी तारामंडल (कॉन्स्टलेशन) और फ़्रीक्वेंसी ट्रैक करें"</string>
+    <!-- no translation found for storage_access (8905018810338984531) -->
     <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+    <!-- no translation found for keywords_storage_access (3708874088152933579) -->
     <skip />
 </resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 4a38b51..41af930 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Loše"</item>
     <item msgid="2042505933058940139">"Loša"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"Starije od 60 dana"</item>
     <item msgid="5692284879054004388">"Starije od 90 dana"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"Upotrijebi postavku mreže"</item>
+    <item msgid="8745603368609022803">"Mreža s ograničenim prometom"</item>
+    <item msgid="2266114985518865625">"Mreža bez ograničenja prometa"</item>
+  </string-array>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index eb9f923..82bab02 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -171,6 +171,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaši uređaji"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Uparivanje novog uređaja"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"Uređaj se može upariti i povezati s Bluetooth uređajima"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Onemogući zvuk zvona unutar pojasne širine"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Nemoj reproducirati prilagođene melodije zvona putem Bluetooth slušalica"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Trenutačno povezano"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"Spremljeni uređaji"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"Dodavanje uređaja"</string>
@@ -332,6 +334,16 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"Postavi datum"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Poredaj abecedno"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Poredaj po vremenskoj zoni"</string>
+    <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+    <skip />
+    <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+    <skip />
+    <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+    <skip />
     <string name="date_picker_title" msgid="1338210036394128512">"Datum"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Vrijeme"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Automatsko zaključavanje"</string>
@@ -350,6 +362,8 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Informacije profila"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Računi"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokacija"</string>
+    <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+    <skip />
     <string name="account_settings_title" msgid="626177544686329806">"Računi"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"Sigurnost i lokacija"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Enkripcija i vjerodajnice"</string>
@@ -702,6 +716,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kao telefonski zvučnik"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Za glazbu i medije"</string>
     <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="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>
@@ -716,6 +732,8 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Naziv"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+    <skip />
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> želi uključiti Wi-Fi"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> želi isključiti Wi-Fi"</string>
@@ -733,6 +751,8 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Uključite Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+    <skip />
     <string name="wifi_settings_category" msgid="8719175790520448014">"Postavke Wi-Fi-ja"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Postavljanje i upravljanje bežičnim pristupnim točkama"</string>
@@ -844,7 +864,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS dostupan)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Unesite mrežnu zaporku"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"Wi‑Fi mreža mobilnog operatera"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"Povežite se putem mreže <xliff:g id="NAME">%1%s</xliff:g>"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Povežite se putem mreže <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Radi poboljšanja preciznosti lokacije kao i u druge svrhe aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> želi uključiti pregledavanje mreže, čak i kada je Wi-Fi isključen.\n\nŽelite li to dozvoliti za sve aplikacije koje žele izvoditi pregledavanje?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Isključite putem opcije Napredno na dodatnom izborniku."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Dopusti"</string>
@@ -971,6 +991,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"Adresa za hitne pozive"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Upotrebljava se kao vaša lokacija kada upućujete hitne pozive putem Wi‑Fi-ja"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Saznajte više"</annotation>" o značajkama privatnog DNS-a"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Prikaz"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Glasnoća"</string>
@@ -1319,6 +1340,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Novi uređaj <xliff:g id="NAME">^1</xliff:g> funkcionira. \n\nDa biste premjestili fotografije, datoteke i podatke aplikacija na taj uređaj, otvorite Postavke &gt; Pohrana."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Premjestite aplikaciju <xliff:g id="APP">^1</xliff:g>"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Premještanje aplikacije <xliff:g id="APP">^1</xliff:g> i njezinih podataka na uređaj <xliff:g id="NAME_0">^2</xliff:g> trajat će samo nekoliko trenutaka. Nećete moći upotrebljavati tu aplikaciju dok premještanje ne završi. \n\nNe uklanjajte uređaj <xliff:g id="NAME_1">^2</xliff:g> tijekom premještanja."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Da biste premjestili podatke, morate otključati korisnika <xliff:g id="APP">^1</xliff:g>."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Premještanje aplikacije <xliff:g id="APP">^1</xliff:g>…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Ne uklanjajte uređaj <xliff:g id="NAME">^1</xliff:g> tijekom premještanja. \n\nAplikacija <xliff:g id="APP">^2</xliff:g> na ovom uređaju neće biti dostupna dok premještanje ne završi."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Otkaži premještanje"</string>
@@ -1479,6 +1501,8 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"Izvori lokacije"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"O tabletnom uređaju"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"O telefonu"</string>
+    <!-- no translation found for about_settings (6717640957897546887) -->
+    <skip />
     <string name="about_settings" product="emulator" msgid="221313099578564438">"O emuliranom uređaju"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Prikaži pravne informacije, status, verziju softvera"</string>
     <string name="legal_information" msgid="5769301644270604095">"Pravne informacije"</string>
@@ -1586,6 +1610,8 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"Pogledajte sve aplikacije (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Vaš tablet i osobni podaci izloženiji su napadima nepoznatih aplikacija. Instaliranjem aplikacija iz takvog izvora prihvaćate odgovornost za svu štetu nastalu na tabletu  ili gubitak podataka uzrokovan upotrebom tih aplikacija."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Vaš telefon i osobni podaci izloženiji su napadima nepoznatih aplikacija. Instaliranjem aplikacija iz takvog izvora prihvaćate odgovornost za svu štetu nastalu na telefonu ili gubitak podataka uzrokovan upotrebom tih aplikacija."</string>
+    <!-- no translation found for install_all_warning (3648003301476423145) -->
+    <skip />
     <string name="advanced_settings" msgid="1777249286757067969">"Napredne postavke"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Omogućiti više opcija postavki"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Info o aplikaciji"</string>
@@ -1886,6 +1912,12 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Može utjecati na izvedbu"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klik kad se pokazivač zaustavi"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Odgoda prije klika"</string>
+    <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+    <skip />
+    <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+    <skip />
+    <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+    <skip />
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"UKLJUČENO"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ISKLJUČENO"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Prikaži u Brzim postavkama"</string>
@@ -2051,10 +2083,36 @@
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Aplikacije koje ne funkcioniraju dobro: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
     <string name="battery_tip_summary_title" msgid="7060523369832289878">"Baterija je u dobrom stanju"</string>
     <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Aplikacije se ponašaju na uobičajen način"</string>
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Slaba baterija"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Baterija će se uskoro isprazniti"</string>
+    <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
     <skip />
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+    <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Intenzivna upotreba telefona"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Intenzivna upotreba tableta"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Intenzivna upotreba uređaja"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"<xliff:g id="HOUR">%1$s</xliff:g> upotrebe od zadnjeg potpunog punjenja"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Baterija se dosta ispraznila zbog intenzivne upotrebe telefona. Vaša se baterija normalno ponaša.\n\n Od zadnjeg potpunog punjenja uređaj ste upotrebljavali oko <xliff:g id="HOUR">%1$s</xliff:g>.\n\n Ukupna upotreba:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Baterija se dosta ispraznila zbog intenzivne upotrebe tableta. Vaša se baterija normalno ponaša.\n\n  Od zadnjeg potpunog punjenja uređaj ste upotrebljavali oko <xliff:g id="HOUR">%1$s</xliff:g>.\n\n Ukupna upotreba:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Baterija se dosta ispraznila zbog intenzivne upotrebe uređaja. Vaša se baterija normalno ponaša.\n\n Od zadnjeg potpunog punjenja uređaj ste upotrebljavali oko <xliff:g id="HOUR">%1$s</xliff:g>.\n\n Ukupna upotreba:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"Pametno upravljanje baterijom"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"Automatsko upravljanje baterijom"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"Automatsko prilagođavanje potrošnje baterije po aplikacijama na temelju upotrebe"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"Ograničene aplikacije"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="one">%1$d aplikacija</item>
+      <item quantity="few">%1$d aplikacije</item>
+      <item quantity="other">%1$d aplikacije</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"Zaustaviti aplikaciju?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Vaš telefon ne može upravljati baterijom na uobičajen način jer ga aplikacija <xliff:g id="APP">%1$s</xliff:g> zadržava u aktivnom stanju.\n\nDa biste pokušali riješiti taj problem, možete zaustaviti tu aplikaciju.\n\nAko se problem ponovi, možda biste trebali deinstalirati tu aplikaciju da biste smanjili potrošnju baterije."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Vaš tablet ne može upravljati baterijom na uobičajen način jer ga aplikacija <xliff:g id="APP">%1$s</xliff:g> zadržava u aktivnom stanju.\n\nDa biste pokušali riješiti taj problem, možete zaustaviti tu aplikaciju.\n\nAko se problem ponovi, možda biste trebali deinstalirati tu aplikaciju da biste smanjili potrošnju baterije."</string>
@@ -2163,6 +2221,8 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Medijski poslužitelj"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Optimizacija aplikacija"</string>
     <string name="battery_saver" msgid="8172485772238572153">"Štednja baterije"</string>
+    <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+    <skip />
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Uključi automatski"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nikada"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"na <xliff:g id="PERCENT">%1$s</xliff:g> baterije"</string>
@@ -2383,6 +2443,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"Ukloniti račun?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Uklanjanjem ovog računa izbrisat će se sve njegove poruke, kontakti i ostali podaci s tabletnog računala!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Uklanjanjem ovog računa izbrisat će se sve njegove poruke, kontakti i ostali podaci s telefona!"</string>
+    <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+    <skip />
     <string name="remove_account_failed" msgid="3901397272647112455">"Vaš administrator ne dopušta tu promjenu"</string>
     <string name="provider_label" msgid="7724593781904508866">"Pokreni pretplate"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2913,8 +2975,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blokiranje vizualnih ometanja"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Dopusti vizualne signale"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"Dodaj"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"UKLJUČI SAD"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"ISKLJUČI SAD"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Uključi sada"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Odmah isključi"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Način Ne uznemiravaj uključen je do <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Način Ne uznemiravaj ostat će uključen dok ga ne isključite"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Način Ne uznemiravaj automatski je uključilo pravilo (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
@@ -2953,7 +3015,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Obavijesti aplikacije"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategorija obavijesti"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"Grupa kategorija obavijesti"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"Važnost"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"Ponašanje"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"Dopusti zvuk"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nikad ne prikazuj obavijesti"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Bez zvučnog ili vizualnog ometanja"</string>
@@ -2971,6 +3033,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Srednja važnost"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Velika važnost"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"Hitno"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"Prikaži obavijesti"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Pomoćnik za obavijesti"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Pristup obavijestima"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Blokiran je pristup obavijestima radnog profila"</string>
@@ -3002,9 +3065,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Pristup opciji Ne ometaj"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nijedna instalirana aplikacija nije zatražila pristup opciji Ne ometaj"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Učitavanje aplikacija..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blokira prikazivanje obavijesti te aplikacije na ovom uređaju"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blokira prikazivanje te kategorije obavijesti na ovom uređaju"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android blokira prikazivanje te grupe obavijesti na ovom uređaju"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"Android na vaš zahtjev blokira prikazivanje obavijesti te aplikacije na ovom uređaju"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Android na vaš zahtjev blokira prikazivanje te kategorije obavijesti na ovom uređaju"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Android na vaš zahtjev blokira prikazivanje te grupe obavijesti na ovom uređaju"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorije"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Drugo"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3601,31 +3664,10 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"Pločice brzih postavki za razvojne programere"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"Rado ćemo vam pomoći"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Uvijek smo tu za vas"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Uvijek smo tu za vas"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"Obratite se našem timu za podršku u vezi s bilo kojom poteškoćom. Zato su tu."</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Naš tim za podršku uvijek je dostupan."</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Pretražite pomoć ili se vratite tijekom radnog vremena podrške (po lokalnom vremenu):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Radno vrijeme telefonske podrške (lokalno vrijeme)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Potražite pomoć ili istražite savjete i trikove"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"Podrška za:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"Putujete u inozemstvo?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"Mogu se primjenjivati međunarodne naknade"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Istraži savjete i trikove"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Pretraži pomoć i pošalji povratne informacije"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"Obratite se podršci"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Prijava"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"Ne možete se prijaviti?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"Slanje informacija o sustavu"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Ne prikazuj ponovo"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"Zahtjev šalje"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"Dodaj račun"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"Informacije o sustavu"</string>
+    <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+    <skip />
+    <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+    <skip />
     <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>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Omogućuje pretraživanjima kontakata vaše organizacije da identificiraju pozivatelje i kontakte"</string>
@@ -3644,11 +3686,12 @@
       <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> sekunde</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sekundi</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> čekanja"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Upravljanje pohranom"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Upravitelj pohrane uklanja fotografije i videozapise s uređaja za koje je napravljena sigurnosna kopija kako bi oslobodio prostor za pohranu."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Ukloni fotografije i videozapise"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Upravitelj pohrane"</string>
+    <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+    <skip />
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatski"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Priručnik"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Oslobodi prostor odmah"</string>
@@ -3821,8 +3864,10 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Upoznajte svoj novi tablet"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Upoznajte svoj novi uređaj"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ova značajka nije dostupna na ovom uređaju"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Primijeni potpuna mjerenja GNSS-a"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Prati sve konstelacije i frekvencije GNSS-a bez određivanja radnog omjera"</string>
+    <!-- no translation found for storage_access (8905018810338984531) -->
     <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+    <!-- no translation found for keywords_storage_access (3708874088152933579) -->
     <skip />
 </resources>
diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml
index 516d688..fb84c13 100644
--- a/res/values-hy/arrays.xml
+++ b/res/values-hy/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Թույլ"</item>
     <item msgid="2042505933058940139">"Թույլ"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"60 օրից հին"</item>
     <item msgid="5692284879054004388">"90 օրից հին"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"Օգտագործել ցանցի կարգավորումները"</item>
+    <item msgid="8745603368609022803">"Սահմանափակ"</item>
+    <item msgid="2266114985518865625">"Անսահմանափակ"</item>
+  </string-array>
 </resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 1f36b25..392dba0 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ձեր սարքերը"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Նոր սարքի զուգակցում"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"Թույլատրել միացումը Bluetooth սարքերին"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Անջատել ներխմբային զանգը"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Չհնչեցնել հեռախոսի հատուկ զանգերանգներ Bluetooth ականջակալներով"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Միացված է"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"Պահված սարքեր"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"Ավելացնել սարք"</string>
@@ -330,6 +332,16 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"Կարգավորել ամսաթիվը"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Տեսակավորել ըստ այբուբենի"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Տեսակավորել ըստ ժամային գոտու"</string>
+    <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+    <skip />
+    <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+    <skip />
+    <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+    <skip />
     <string name="date_picker_title" msgid="1338210036394128512">"Ամսաթիվ"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Ժամանակը"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Ինքնակողպում"</string>
@@ -348,6 +360,8 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Պրոֆիլի տեղեկություններ"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Հաշիվներ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Տեղադրություն"</string>
+    <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+    <skip />
     <string name="account_settings_title" msgid="626177544686329806">"Հաշիվներ"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"Անվտանգություն &amp; տեղադրություն"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Գաղտնագրում և մուտքի տվյալներ"</string>
@@ -691,6 +705,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Որպես բարձրախոս հեռախոս"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Երաժշտության և մեդիայի համար"</string>
     <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="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>
@@ -705,6 +721,8 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Անուն"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 ԳՀց"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 ԳՀց"</string>
+    <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+    <skip />
     <string name="link_speed" msgid="8896664974117585555">"%1$d Մբ/վ"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> հավելվածը ցանկանում է միացնել Wi-Fi-ը"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> հավելվածը ցանկանում է անջատել Wi-Fi-ը"</string>
@@ -722,6 +740,8 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Միացնել Wi-Fi-ը"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+    <skip />
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi կարգավորումներ"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Կարգավորել և կառավարել անլար միացման կետերը"</string>
@@ -833,7 +853,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS-ը հասանելի է)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Մուտքագրեք ձեր ցանցի գաղտնաբառը"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"Օպերատորի Wi‑Fi ցանց"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"Միանալ <xliff:g id="NAME">%1%s</xliff:g>-ի միջոցով"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Միանալ <xliff:g id="NAME">%1$s</xliff:g>-ի միջոցով"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Տեղադրության ճշգրտությունը կատարելագործելու կամ այլ նպատակների համար` <xliff:g id="APP_NAME">%1$s</xliff:g>-ը ցանկանում է միացնել ցանցի սկանավորումը, նույնիսկ եթե Wi-Fi-ը անջատված է:\n\nԹույլատրե՞լ բոլոր սկանավորում ցանկացող ծրագրերին:"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Սա անջատելու համար գերբեռնված ցանկում անցեք Ընդլայնված:"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Թույլատրել"</string>
@@ -909,10 +929,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Հաճախականությունների դիապազոն"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Թեժ կետի միջոցով ստեղծեք Wi‑Fi ցանց ձեր այլ սարքերի hամար: Թեժ կետը տրամադրում է ինտերնետային կապ բջջային ցանցի միջոցով: Կարող են կիրառվել լրացուցիչ գանձումներ։"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Հավելվածները կարող են ստեղծել թեժ կետ՝ բովանդակությունը մոտակա սարքերին փոխանցելու համար:"</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Ավտոմատ անջատել թեժ կետը"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Wi‑Fi թեժ կետը կանջատվի, եթե որևէ սարք միացած չլինի դրան"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Թեժ կետի միացում…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Թեժ կետերը անջատվում են..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ցանցն ակտիվ է"</string>
@@ -961,6 +979,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"Արտակարգ իրավիճակների հասցե"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Օգտագործվում է որպես ձեր հասցեն, երբ Wi‑Fi-ի միջոցով շտապ կանչ եք կատարում"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Մանրամասն"</annotation>" անհատական DNS սերվերի մասին"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Էկրան"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ձայն"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Հնչողությունը"</string>
@@ -1308,6 +1327,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Նոր <xliff:g id="NAME">^1</xliff:g>-ն աշխատում է: \n\nԼուսանկարներ, ֆայլեր և հավելվածների տվյալներ այս սարք տեղափոխելու համար անցեք Կարգավորումներ &gt; Տարածք:"</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Տեղափոխել <xliff:g id="APP">^1</xliff:g> հավելվածը"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> հավելվածի և նրա տվյալների տեղափոխումը <xliff:g id="NAME_0">^2</xliff:g> ընդամենը մի քանի վայրկյան կտևի: Դուք չեք կարողանա օգտագործել հավելվածը մինչև տեղափոխումը չավարտվի: \n\nՏեղափոխման ընթացքում չհեռացնեք <xliff:g id="NAME_1">^2</xliff:g>-ը:"</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Տվյալները տեղափոխելու համար արգելաբացեք <xliff:g id="APP">^1</xliff:g> օգտատիրոջը:"</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> հավելվածի տեղափոխում…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Տեղափոխման ընթացքում չհեռացնեք <xliff:g id="NAME">^1</xliff:g>-ը: \n\n<xliff:g id="APP">^2</xliff:g> հավելվածը հասանելի չի լինի մինչև տեղափոխումը չավարտվի:"</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Չեղարկել տեղափոխումը"</string>
@@ -1468,6 +1488,8 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"Տեղադրության աղբյուրներ"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Պլանշետի մասին"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Հեռախոսի մասին"</string>
+    <!-- no translation found for about_settings (6717640957897546887) -->
+    <skip />
     <string name="about_settings" product="emulator" msgid="221313099578564438">"Էմուլացված սարքի մասին"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Դիտել իրավական տեղեկությունները, կարգավիճակը, ծրագրի տարբերակը"</string>
     <string name="legal_information" msgid="5769301644270604095">"Իրավական տեղեկատվություն"</string>
@@ -1575,6 +1597,8 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"Տեսնել բոլոր <xliff:g id="COUNT">%1$d</xliff:g> հավելվածները"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Ձեր պլանշետն ու անձնական տվյալներն առավել խոցելի են անհայտ հավելվածների գրոհների նկատմամբ: Տեղադրելով հավելվածներ այս աղբյուրից՝ դուք ընդունում եք, որ պատասխանատվություն եք կրում ձեր պլանշետին պատճառած ցանկացած վնասի կամ տվյալների կորստի համար, որը կարող է տեղի ունենալ դրանք օգտագործելու արդյունքում:"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Ձեր սարքն ու անձնական տվյալներն առավել խոցելի են անհայտ հավելվածների գրոհների նկատմամբ: Տեղադրելով հավելվածներ այս աղբյուրից՝ դուք ընդունում եք, որ պատասխանատվություն եք կրում ձեր սարքին պատճառած ցանկացած վնասի կամ տվյալների կորստի համար, որը կարող է տեղի ունենալ դրանք օգտագործելու արդյունքում:"</string>
+    <!-- no translation found for install_all_warning (3648003301476423145) -->
+    <skip />
     <string name="advanced_settings" msgid="1777249286757067969">"Ընդլայնված կարգավորումներ"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Միացնել այլ կարգավորման ընտրանքներ"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Հավելվածի մասին"</string>
@@ -1874,6 +1898,12 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Կարող է ազդել սարքի աշխատանքի վրա"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Սեղմում նշորդը կանգնելուց հետո"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Հապաղումը սեղմելուց առաջ"</string>
+    <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+    <skip />
+    <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+    <skip />
+    <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+    <skip />
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ՄԻԱՑՎԱԾ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ԱՆՋԱՏՎԱԾ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Ցույց տալ Արագ կարգավորումներում"</string>
@@ -2030,14 +2060,37 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Սարքը հանում է քնի ռեժիմից ֆոնում"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Հայցում է տեղադրության տվյալները շատ հաճախ"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> հավելված ցուցաբերում է արտասովոր պահվածք"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Մարտկոցը գտնվում է լավ վիճակում"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Հավելվածների աշխատանքում շեղումներ չեն հայտնաբերվել"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Մարտկոցի լիցքը բավարար չէ"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Մարտկոցի լիցքը շուտով կսպառվի"</string>
+    <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+    <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Հեռախոսը շատ է օգտագործվել"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Պլանշետը շատ է օգտագործվել"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Սարքը շատ է օգտագործվել"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Վերջին լրիվ լիցքավորումից հետո օգտագործվել է մոտավորապես <xliff:g id="HOUR">%1$s</xliff:g>"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Հեռախոսի ակտիվ օգտագործման պատճառով մարտկոցի լիցքը արագ է սպառվել։ Մարտկոցը նորմալ վիճակում է։\n\n Վերջին լրիվ լիցքավորումից հետո հեռախոսն օգտագործվել է մոտ <xliff:g id="HOUR">%1$s</xliff:g>:\n\n Ընդհանուր օգտագործումը՝"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Պլանշետի ակտիվ օգտագործման պատճառով մարտկոցի լիցքը արագ է սպառվել։ Մարտկոցը նորմալ վիճակում է։\n\n Վերջին լրիվ լիցքավորումից հետո պլանշետն օգտագործվել է մոտ <xliff:g id="HOUR">%1$s</xliff:g>:\n\n Ընդհանուր օգտագործումը՝"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Սարքի ակտիվ օգտագործման պատճառով մարտկոցի լիցքը արագ է սպառվել։ Մարտկոցը նորմալ վիճակում է։ \n\n Վերջին լրիվ լիցքավորումից հետո սարքն օգտագործվել է մոտ <xliff:g id="HOUR">%1$s</xliff:g>:\n\n Ընդհանուր օգտագործումը՝"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"Մարտկոցի խելացի կառավարիչ"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"Մարտկոցի ավտոմատ կառավարում"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"Ավտոմատ կարգավորել հավելվածների էներգասպառումը"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"Սահմանափակ հասանելիությամբ հավելվածներ"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="one">%1$d հավելված</item>
+      <item quantity="other">%1$d հավելված</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"Փակե՞լ հավելվածը"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Ձեր հեռախոսը չի կարող ինչպես հարկն է կառավարել մարտկոցի լիցքը, քանի որ <xliff:g id="APP">%1$s</xliff:g> հավելվածը սարքին թույլ չի տալիս անցնել քնի ռեժիմ:։\n\nԱյս խնդիրը շտկելու համար կարող եք դադարեցնել\n\nհավելվածի աշխատանքը: Եթե խնդիրը չվերանա, ապա հնարավոր է պահանջվի ապատեղադրել հավելվածը՝ մարտկոցի աշխատանքը բարելավելու համար:"</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Ձեր պլանշետը չի կարող ինչպես հարկն է կառավարել մարտկոցի լիցքը, քանի որ <xliff:g id="APP">%1$s</xliff:g> հավելվածը պլանշետին թույլ չի տալիս անցնել քնի ռեժիմ:\n\nԱյս խնդիրը շտկելու համար կարող եք դադարեցնել\n\nհավելվածի աշխատանքը: Եթե խնդիրը չվերանա, ապա հնարավոր է պահանջվի ապատեղադրել հավելվածը՝ մարտկոցի աշխատանքը բարելավելու համար:"</string>
@@ -2146,6 +2199,8 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Մեդիասերվեր"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Հավելվածի օպտիմալացում"</string>
     <string name="battery_saver" msgid="8172485772238572153">"Մարտկոցի տնտեսում"</string>
+    <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+    <skip />
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Ավտոմատ միացնել"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Երբեք"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"մատկոցի <xliff:g id="PERCENT">%1$s</xliff:g> լիցքի դեպքում"</string>
@@ -2366,6 +2421,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"Հեռացնե՞լ հաշիվը:"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Այս հաշիվը հեռացնելիս պլանշետից կջնջվեն նաև բոլոր հաղորդագրությունները, կոնտակտները և այլ տվյալները:"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Այս հաշվի հեռացումից հեռախոսից կջնջվեն նաև բոլոր հաղորդագրությունները, կոնտակտները և այլ տվյալները:"</string>
+    <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+    <skip />
     <string name="remove_account_failed" msgid="3901397272647112455">"Ձեր ադմինիստրատորը չի թույլատրում այս փոփոխությունը"</string>
     <string name="provider_label" msgid="7724593781904508866">"Ներկայացնել բաժանորդագրությունները"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2890,8 +2947,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Արգելափակել տեսողական ծանուցումները"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Թույլատրել տեսողական ազդանշանները"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"Ավելացնել"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ՄԻԱՑՆԵԼ"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"ԱՆՋԱՏԵԼ"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Միացնել հիմա"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Անջատել հիմա"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"«Չանհանգստացնել» ռեժիմն ակտիվ է մինչև <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"«Չանհանգստացնել» ռեժիմն ակտիվ կլինի, մինչև այն չանջատեք"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"«Չանհանգստացնել» ռեժիմն ավտոմատ միացվել է <xliff:g id="RULE_NAME">%s</xliff:g> կանոնի կողմից"</string>
@@ -2930,7 +2987,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Հավելվածների ծանուցումներ"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Ծանուցման կատեգորիա"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"Ծանուցումների կատեգորիաների խումբ"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"Կարևորություն"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"Տարբերակներ"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"Թույլատրել ձայնը"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Երբեք չցուցադրել ծանուցումները"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Առանց ձայնի և տեսողական ընդհատումների"</string>
@@ -2948,6 +3005,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Միջին կարևորություն"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Բարձր կարևորություն"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"Հրատապ կարևորություն"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"Միացնել ծանուցումները"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Ծանուցումների օգնական"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Ծանուցումների օգտագործում"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Աշխատանքային պրոֆիլի ծանուցումների մուտքն արգելափակված է"</string>
@@ -2978,10 +3036,10 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Հասանելիությունը՝ «չանհանգստացնել»"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Տեղադրված հավելվածներից ոչ մեկը Չանհանգստացնել հարցում չի ուղարկել"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ծրագրերը բեռնվում են..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android-ն արգելափակում է այս հավելվածի ծանուցումները"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android-ն արգելափակում է ծանուցումների տվյալ կատեգորիայի ցուցադրումը"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android-ն արգելափակում է ծանուցումների տվյալ խմբի ցուցադրումը"</string>
-    <string name="notification_channels" msgid="5346841743182627500">"Կարգեր"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"Դուք անջատել եք այս հավելվածի ծանուցումները"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Դուք անջատել եք ծանուցումների այս կատեգորիան"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Դուք անջատել եք ծանուցումների այս խումբը"</string>
+    <string name="notification_channels" msgid="5346841743182627500">"Անվանակարգեր"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Այլ"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> կատեգորիա</item>
@@ -3559,31 +3617,10 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Կապակցված է բազմակի շարժական սարքերի"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Համակարգի միջերեսի ցուցադրական ռեժիմ"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Մշակողի արագ կարգավորման սալիկներ"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"Մեր նպատակն է օգնել ձեզ"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Մենք աշխատում ենք շուրջօրյա"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Մենք աշխատում ենք շուրջօրյա"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"Մեր աջակցման թիմը կօգնի լուծել ձեր ցանկացած խնդիրը"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Մեր աջակցման թիմն աշխատում է ամեն օր, շուրջօրյա"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Դիմեք օգնության կամ նորից այցելեք աջակցման ծառայության աշխատանքային ժամերի ընթացքում (տեղային ժամանակով)՝&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Հեռախոսով աջակցում տրամադրելու ժամերը (տեղային ժամանակով)՝&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Փնտրեք օգնություն կամ ուսումնասիրեք խորհուրդներն ու հնարքները"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"Աջակցություն հետևյալ երկրի համար՝"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"Ուղևորվում եք երկրից դո՞ւրս:"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"Միջազգային կապի համար կարող են վճարներ գանձվել"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Հեռախոս"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"Զրուցել"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Ուսումնասիրել խորհուրդներն ու հնարքները"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Այցելել օգնության կենտրոն կամ կարծիք հայտնել"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"Կապվել աջակցության կենտրոնի հետ"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Մուտք գործել"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"Չե՞ք կարողանում մուտք գործել"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"Ուղարկել համակարգի մասին տեղեկատվություն"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Այլևս ցույց չտալ"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"Ուղարկող՝"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"Ավելացնել հաշիվ"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"Համակարգային տեղեկություններ"</string>
+    <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+    <skip />
+    <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+    <skip />
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Աշխատանքային պրոֆիլի կարգավորումներ"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Կոնտակտների որոնում"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Թույլատրել ձեր կազմակերպությանը որոնել կոնտակտներ՝ զանգողներին և կոնտակտները նույնականացնելու համար:"</string>
@@ -3599,11 +3636,12 @@
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> վայրկյան</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> վայրկյան</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> սպասում"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Կառավարել հիշողությունը"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Տարածք ազատելու նպատակով հիշողության կառավարիչը ձեր սարքից հեռացնում է պահուստավորած լուսանկարները և տեսանյութերը:"</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Հեռացնել լուսանկարները և տեսանյութերը"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Հիշողության կառավարիչ"</string>
+    <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+    <skip />
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Ավտոմատ"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Ձեռքով"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Ազատել տարածք հիմա"</string>
@@ -3769,8 +3807,10 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ծանոթացեք ձեր նոր պլանշետին"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Ծանոթացեք ձեր նոր սարքին"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Տվյալ գործառույթը հասանելի չէ այս սարքի վրա"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"GNSS-ի չափումների ամբողջական բեռնում"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Հետագծել GNSS-ի բոլոր սխեմաներն ու հաճախականությունները՝ առանց աշխատաշրջանի"</string>
+    <!-- no translation found for storage_access (8905018810338984531) -->
     <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+    <!-- no translation found for keywords_storage_access (3708874088152933579) -->
     <skip />
 </resources>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index d317a9a..0cdaef4 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Buruk"</item>
     <item msgid="2042505933058940139">"Buruk"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"Lebih dari 60 hari"</item>
     <item msgid="5692284879054004388">"Lebih dari 90 hari"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"Gunakan preferensi jaringan"</item>
+    <item msgid="8745603368609022803">"Perlakukan sebagai terukur"</item>
+    <item msgid="2266114985518865625">"Perlakukan sebagai belum terukur"</item>
+  </string-array>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 0efa7cf..ca150bc 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Perangkat Anda"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sambungkan perangkat baru"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"Izinkan perangkat disambungkan dan dihubungkan ke perangkat bluetooth"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Nonaktifkan dering in-band"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Jangan putar nada dering ponsel kustom pada headset Bluetooth"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Tersambung saat ini"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"Perangkat yang tersimpan"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"Tambahkan perangkat"</string>
@@ -330,6 +332,11 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"Setel tanggal"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Urutkan menurut abjad"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Urutkan menurut zona waktu"</string>
+    <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> dimulai pada <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+    <string name="zone_time_type_dst" msgid="8850494578766845276">"Waktu musim panas"</string>
+    <string name="zone_time_type_standard" msgid="3462424485380376522">"Waktu standar"</string>
+    <string name="zone_menu_by_region" msgid="4603214570803607532">"Zona waktu berdasarkan wilayah"</string>
+    <string name="zone_menu_by_offset" msgid="1172774718486088771">"Zona waktu dengan offset tetap"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Tanggal"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Waktu"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Mengunci secara otomatis"</string>
@@ -348,6 +355,7 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Info profil"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Akun"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokasi"</string>
+    <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Gunakan lokasi"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Akun"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"Keamanan &amp; lokasi"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Enkripsi &amp; kredensial"</string>
@@ -691,6 +699,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Sebagai pengeras suara telepon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Untuk musik dan media"</string>
     <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="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>
@@ -705,6 +715,7 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nama"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Login"</string>
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> ingin mengaktifkan Wi-Fi"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> ingin menonaktifkan Wi-Fi"</string>
@@ -722,6 +733,7 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Nyalakan Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Gunakan Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="8719175790520448014">"Setelan Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Siapkan &amp; kelola titik akses nirkabel"</string>
@@ -833,7 +845,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tersedia)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Masukkan sandi jaringan Anda"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"Jaringan Wi‑Fi operator"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"Sambungkan melalui <xliff:g id="NAME">%1%s</xliff:g>"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Sambungkan melalui <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Untuk meningkatkan ketepatan lokasi dan untuk tujuan lainnya, <xliff:g id="APP_NAME">%1$s</xliff:g> ingin mengaktifkan pemindaian jaringan, bahkan saat Wi-Fi sedang tidak aktif.\n\nIzinkan ini untuk semua aplikasi yang ingin memindai?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Untuk menonaktifkannya, buka Lanjutan di menu luapan."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Izinkan"</string>
@@ -909,10 +921,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Pita AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Gunakan hotspot untuk membuat jaringan Wi‑Fi bagi perangkat Anda yang lain. Hotspot menyediakan sambungan internet menggunakan koneksi data seluler Anda. Biaya data seluler tambahan mungkin berlaku."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikasi dapat membuat hotspot untuk berbagi konten dengan perangkat di sekitar."</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Nonaktifkan hotspot secara otomatis"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Hotspot Wi-Fi akan dinonaktifkan jika tidak ada perangkat yang terhubung"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Menyalakan hotspot..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Mematikan hotspot..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktif"</string>
@@ -961,6 +971,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"Alamat Darurat"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Digunakan sebagai lokasi Anda ketika Anda melakukan panggilan darurat melalui Wi‑Fi"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Pelajari lebih lanjut"</annotation>" tentang fitur DNS Pribadi"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tampilan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Suara"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
@@ -1308,6 +1319,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> baru sedang bekerja. \n\nUntuk memindahkan foto, file, dan data aplikasi ke perangkat ini, buka Setelan &gt; Pemindahan."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Pindahkan <xliff:g id="APP">^1</xliff:g>"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Pemindahan <xliff:g id="APP">^1</xliff:g> dan datanya ke <xliff:g id="NAME_0">^2</xliff:g> hanya akan berlangsung sebentar. Anda tidak akan dapat menggunakan aplikasi hingga pemindahan selesai. \n\nJangan cabut <xliff:g id="NAME_1">^2</xliff:g> selama pemindahan."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Untuk memindahkan data yang dibutuhkan guna membuka <xliff:g id="APP">^1</xliff:g> pengguna."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Memindahkan <xliff:g id="APP">^1</xliff:g>…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Jangan cabut <xliff:g id="NAME">^1</xliff:g> selama pemindahan. \n\nAplikasi <xliff:g id="APP">^2</xliff:g> di perangkat ini baru dapat tersedia jika pemindahan selesai."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Batalkan pemindahan"</string>
@@ -1468,6 +1480,7 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"Sumber lokasi"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Tentang tablet"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Tentang ponsel"</string>
+    <string name="about_settings" product="device" msgid="6717640957897546887">"Tentang perangkat"</string>
     <string name="about_settings" product="emulator" msgid="221313099578564438">"Tentang perangkat yang diemulasi"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Lihat info legal, status, versi software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informasi hukum"</string>
@@ -1575,6 +1588,7 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"Lihat <xliff:g id="COUNT">%1$d</xliff:g> aplikasi semuanya"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tablet dan data pribadi lebih rentan terhadap serangan oleh aplikasi yang tidak dikenal. Dengan menginstal aplikasi dari sumber ini, Anda setuju bahwa Anda bertanggung jawab atas kerusakan tablet atau kehilangan data yang mungkin terjadi akibat penggunaannya."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Ponsel dan data pribadi lebih rentan terhadap serangan oleh aplikasi yang tidak dikenal. Dengan menginstal aplikasi dari sumber ini, Anda setuju bahwa Anda bertanggung jawab atas kerusakan ponsel atau kehilangan data yang mungkin terjadi akibat penggunaannya."</string>
+    <string name="install_all_warning" product="device" msgid="3648003301476423145">"Perangkat dan data pribadi lebih rentan terhadap serangan oleh aplikasi yang tidak dikenal. Dengan menginstal aplikasi dari sumber ini, Anda setuju bahwa Anda bertanggung jawab atas kerusakan perangkat atau kehilangan data yang mungkin terjadi akibat penggunaannya."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Setelan lanjutan"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Aktifkan opsi setelan yang lain"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Info aplikasi"</string>
@@ -1874,6 +1888,9 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Mungkin memengaruhi performa"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klik setelah penunjuk mouse berhenti bergerak"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Keterlambatan sebelum klik"</string>
+    <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="enable_quick_setting" msgid="2366999897816894536">"Tampilkan di Setelan Cepat"</string>
@@ -2030,14 +2047,35 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Mengaktifkan perangkat di latar belakang"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Meminta informasi lokasi terlalu sering"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplikasi mengalami gangguan"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Baterai dalam keadaan baik"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Aplikasi berperilaku normal"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Kapasitas baterai rendah"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Masa pakai baterai kurang lama"</string>
+    <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Aktifkan pengelola baterai cerdas"</string>
+    <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Aktifkan untuk mengoptimalkan penggunaan baterai"</string>
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
     <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Ponsel digunakan terlalu lama"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Tablet digunakan terlalu lama"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Perangkat digunakan terlalu lama"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Sekitar <xliff:g id="HOUR">%1$s</xliff:g> digunakan sejak terakhir kali baterainya diisi penuh"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Ponsel digunakan terlalu lama sehingga menghabiskan banyak baterai. Baterai berperilaku normal.\n\n Ponsel digunakan selama sekitar <xliff:g id="HOUR">%1$s</xliff:g> sejak terahir kali baterainya diisi penuh.\n\n Penggunaan total:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Tablet digunakan terlalu lama sehingga menghabiskan banyak baterai. Baterai berperilaku normal.\n\n Tablet digunakan selama sekitar <xliff:g id="HOUR">%1$s</xliff:g> sejak terahir kali baterainya diisi penuh.\n\n Penggunaan total:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Perangkat digunakan terlalu lama sehingga menghabiskan banyak baterai. Baterai berperilaku normal.\n\n Perangkat digunakan selama sekitar <xliff:g id="HOUR">%1$s</xliff:g> sejak terakhir kali baterainya diisi penuh.\n\n Penggunaan total:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"Pengelola baterai smart"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"Kelola baterai secara otomatis"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"Otomatis menyesuaikan penggunaan daya oleh aplikasi berdasarkan penggunaan"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"Aplikasi yang dibatasi"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="other">%1$d aplikasi</item>
+      <item quantity="one">%1$d aplikasi</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"Hentikan aplikasi?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Ponsel Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP">%1$s</xliff:g> membuat ponsel selalu aktif.\n\nUntuk menyelesaikan masalah ini, Anda dapat menghentikan aplikasi.\n\nJika masalah tersebut terus berlanjut, aplikasi mungkin perlu di-uninstal untuk meningkatkan performa baterai."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Tablet Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP">%1$s</xliff:g> membuat tablet selalu aktif.\n\nUntuk menyelesaikan masalah ini, Anda dapat menghentikan aplikasi.\n\nJika masalah tersebut terus berlanjut, aplikasi mungkin perlu di-uninstal untuk meningkatkan performa baterai."</string>
@@ -2146,6 +2184,7 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Pengoptimalan aplikasi"</string>
     <string name="battery_saver" msgid="8172485772238572153">"Penghemat Baterai"</string>
+    <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Gunakan Penghemat Baterai"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Aktifkan secara otomatis"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Tidak pernah"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"jika <xliff:g id="PERCENT">%1$s</xliff:g> baterai"</string>
@@ -2366,6 +2405,7 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"Hapus akun?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Menghapus akun ini akan menghapus semua pesan, kontak, dan data lain akun tersebut dari tablet!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Menghapus akun ini akan menghapus semua pesan, kontak, dan data lainnya akun tersebut dari ponsel!"</string>
+    <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Menghapus akun ini akan menghapus semua pesan, kontak, dan data lain akun tersebut dari perangkat."</string>
     <string name="remove_account_failed" msgid="3901397272647112455">"Perubahan ini tidak diizinkan oleh admin"</string>
     <string name="provider_label" msgid="7724593781904508866">"Langganan push"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2890,8 +2930,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blokir gangguan visual"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Izinkan sinyal visual"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"Tambahkan"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"AKTIFKAN SEKARANG"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"NONAKTIFKAN SEKARANG"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Aktifkan sekarang"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Nonaktifkan sekarang"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Mode Jangan Ganggu aktif hingga <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Mode Jangan Ganggu akan tetap aktif hingga Anda menonaktifkannya"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Mode Jangan Ganggu otomatis diaktifkan oleh aturan <xliff:g id="RULE_NAME">%s</xliff:g>"</string>
@@ -2930,7 +2970,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Notifikasi apl"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategori notifikasi"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"Grup kategori notifikasi"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"Tingkat Kepentingan"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"Perilaku"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"Izinkan suara"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Jangan pernah tampilkan notifikasi"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Tidak ada gangguan suara atau visual"</string>
@@ -2948,6 +2988,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Tingkat kepentingan sedang"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Tingkat kepentingan tinggi"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"Tingkat kepentingan darurat"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"Tampilkan notifikasi"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Asisten notifikasi"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Akses notifikasi"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Akses ke notifikasi profil kerja diblokir"</string>
@@ -2978,9 +3019,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Akses Jangan Ganggu"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Tidak ada aplikasi terpasang yang meminta akses Jangan Ganggu"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Memuat aplikasi..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android memblokir notifikasi aplikasi ini agar tidak muncul di perangkat ini"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android memblokir kategori notifikasi ini agar tidak muncul di perangkat ini"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android memblokir grup notifikasi ini agar tidak muncul di perangkat ini"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"Sesuai permintaan, Android memblokir notifikasi aplikasi ini agar tidak muncul di perangkat ini"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Sesuai permintaan, Android kategori notifikasi ini agar tidak muncul di perangkat ini"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Sesuai permintaan, Android memblokir grup notifikasi ini agar tidak muncul di perangkat ini"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategori"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Lainnya"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3559,31 +3600,8 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"Ubin developer setelan cepat"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"Kami siap membantu"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Kami siap sedia di sini untuk Anda 7 x 24 jam"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Kami siap membantu Anda 7x24 jam"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"Tim dukungan kami siap membantu mengatasi masalah"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Tim dukungan kami siap sedia sepanjang hari, setiap hari."</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Telusuri bantuan atau coba lagi saat jam kerja tim dukungan (waktu lokal):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Jam dukungan telepon (waktu lokal)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Telusuri bantuan atau jelajahi kiat &amp; trik"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"Dukungan untuk:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"Bepergian ke luar negeri?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"Mungkin dikenakan biaya internasional"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telepon"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Jelajahi kiat &amp; trik"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Telusuri bantuan &amp; kirim masukan"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"Hubungi tim dukungan"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Masuk"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"Tidak dapat masuk?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"Kirim informasi sistem"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Jangan tampilkan lagi"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"Meminta sebagai"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"Tambahkan akun"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"Informasi sistem"</string>
+    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Jejak Jendela"</string>
+    <string name="layer_trace_quick_settings_title" msgid="2447147947568109649">"Jejak Lapisan"</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>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Izinkan penelusuran kontak oleh organisasi untuk mengidentifikasi penelepon dan kontak"</string>
@@ -3599,11 +3617,11 @@
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> detik</item>
       <item quantity="one">1 detik</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Tim ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Kelola penyimpanan"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Untuk membantu mengosongkan ruang penyimpanan, pengelola penyimpanan menghapus foto dan video cadangan dari perangkat Anda."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Hapus foto &amp; video"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Pengelola penyimpanan"</string>
+    <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Gunakan Pengelola penyimpanan"</string>
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Otomatis"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Kosongkan ruang sekarang"</string>
@@ -3769,8 +3787,8 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ikuti tur tentang tablet baru Anda"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Ikuti tur tentang perangkat baru Anda"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Fitur ini tidak tersedia di perangkat"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
-    <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
-    <skip />
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Paksa ukuran GNSS penuh"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Melacak semua konstelasi dan frekuensi GNSS tanpa siklus tugas"</string>
+    <string name="storage_access" msgid="8905018810338984531">"Akses penyimpanan"</string>
+    <string name="keywords_storage_access" msgid="3708874088152933579">"direktori cakupan akses penyimpanan"</string>
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 1d912d4..1ce70eb 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Scadente"</item>
     <item msgid="2042505933058940139">"Scarsa"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"Oltre 60 giorni"</item>
     <item msgid="5692284879054004388">"Oltre 90 giorni"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"Usa preferenza rete"</item>
+    <item msgid="8745603368609022803">"Considera misurata"</item>
+    <item msgid="2266114985518865625">"Considera non misurata"</item>
+  </string-array>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index ea0e7fb..10e107d 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"I tuoi dispositivi"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Accoppia nuovo dispositivo"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"Consenti l\'accoppiamento e la connessione del dispositivo a dispositivi Bluetooth"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Disattiva suoneria in banda"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Non riprodurre le suonerie del telefono personalizzate tramite gli auricolari Bluetooth"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Attualmente connessi"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"Dispositivi salvati"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"Aggiungi dispositivo"</string>
@@ -330,6 +332,11 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"Imposta data"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordina per nome"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordina per fuso orario"</string>
+    <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> inizia il giorno <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+    <string name="zone_time_type_dst" msgid="8850494578766845276">"Ora legale"</string>
+    <string name="zone_time_type_standard" msgid="3462424485380376522">"Ora solare"</string>
+    <string name="zone_menu_by_region" msgid="4603214570803607532">"Fuso orario per area geografica"</string>
+    <string name="zone_menu_by_offset" msgid="1172774718486088771">"Fusi orari con offset fisso"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Ora"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Blocca automaticamente"</string>
@@ -348,6 +355,7 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Informazioni profilo"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Account"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Geolocalizzazione"</string>
+    <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Usa posizione"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Account"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"Sicurezza e posizione"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Crittografia e credenziali"</string>
@@ -691,6 +699,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Come vivavoce"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Per musica e audio media"</string>
     <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="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>
@@ -705,6 +715,7 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nome"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Accedi"</string>
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> chiede di attivare il Wi-Fi"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> chiede di disattivare il Wi-Fi"</string>
@@ -722,6 +733,7 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Attiva Wi‑Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Utilizza Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="8719175790520448014">"Impostazioni Wi‑Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configura e gestisci punti di accesso wireless"</string>
@@ -833,7 +845,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponibile)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Inserisci la password di rete"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"Rete Wi‑Fi dell\'operatore"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"Connettiti tramite <xliff:g id="NAME">%1%s</xliff:g>"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Connettiti tramite <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Per migliorare la precisione della posizione e per altri scopi, <xliff:g id="APP_NAME">%1$s</xliff:g> chiede di attivare la ricerca della rete, anche quando il Wi-Fi è disattivato.\n\nConsetirlo a tutte le app che vogliono eseguire la ricerca?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Per disattivare questa impostazione, vai alla sezione Avanzate nel menu extra."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Consenti"</string>
@@ -959,6 +971,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"Indirizzo per le emergenze"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Viene considerato la tua posizione quando fai una chiamata di emergenza tramite Wi‑Fi"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Ulteriori informazioni"</annotation>" sulle funzioni DNS private"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Audio"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumi"</string>
@@ -1306,6 +1319,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"La tua nuova <xliff:g id="NAME">^1</xliff:g> è attiva. \n\nPer spostare foto, file e dati delle app su questo dispositivo, seleziona Impostazioni &gt; Memoria."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Sposta <xliff:g id="APP">^1</xliff:g>"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Lo spostamento dell\'app <xliff:g id="APP">^1</xliff:g> e dei relativi dati sulla <xliff:g id="NAME_0">^2</xliff:g> sarà veloce. Potrai utilizzare l\'app soltanto al termine dello spostamento. \n\nNon rimuovere la <xliff:g id="NAME_1">^2</xliff:g> durante lo spostamento."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Per spostare i dati devi sbloccare l\'utente <xliff:g id="APP">^1</xliff:g>."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Spostamento dell\'app <xliff:g id="APP">^1</xliff:g>…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Non rimuovere la <xliff:g id="NAME">^1</xliff:g> durante lo spostamento. \n\nL\'app <xliff:g id="APP">^2</xliff:g> su questo dispositivo sarà disponibile soltanto al termine dello spostamento."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Annulla spostamento"</string>
@@ -1466,6 +1480,7 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"Fonti di geolocalizzazione"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Informazioni sul tablet"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Informazioni sul telefono"</string>
+    <string name="about_settings" product="device" msgid="6717640957897546887">"Informazioni sul dispositivo"</string>
     <string name="about_settings" product="emulator" msgid="221313099578564438">"Informazioni sul dispositivo emulato"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Visualizza informazioni legali, stato, versione del software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informazioni legali"</string>
@@ -1573,6 +1588,7 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"Mostra tutte le app (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Il tablet e i dati personali sono più vulnerabili agli attacchi provenienti da app sconosciute. Installando le app provenienti da questa origine, accetti di essere responsabile degli eventuali danni al tablet o della perdita di dati che potrebbero derivare dall\'utilizzo di queste app."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Il telefono e i dati personali sono più vulnerabili agli attacchi provenienti da app sconosciute. Installando le app provenienti da questa origine, accetti di essere responsabile degli eventuali danni al telefono o della perdita di dati che potrebbero derivare dall\'utilizzo di queste app."</string>
+    <string name="install_all_warning" product="device" msgid="3648003301476423145">"Il dispositivo e i dati personali sono più vulnerabili agli attacchi provenienti da app sconosciute. Installando le app provenienti da questa origine, accetti di essere responsabile degli eventuali danni al dispositivo o della perdita di dati che potrebbero derivare dall\'utilizzo di queste app."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Impostazioni avanzate"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Attiva altre impostazioni"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informazioni app"</string>
@@ -1872,6 +1888,9 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Potrebbe influire sulle prestazioni"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clic quando puntatore si ferma"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Ritardo prima del clic"</string>
+    <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="enable_quick_setting" msgid="2366999897816894536">"Mostra in Impostazioni rapide"</string>
@@ -2030,10 +2049,33 @@
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> app con comportamenti anomali"</string>
     <string name="battery_tip_summary_title" msgid="7060523369832289878">"La batteria è in buone condizioni"</string>
     <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Le app hanno un comportamento normale"</string>
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Capacità della batteria in esaurimento"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"La batteria non può fornire una buona durata"</string>
+    <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Attiva gestione batteria intelligente"</string>
+    <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Attiva per ottimizzare l\'utilizzo della batteria"</string>
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+    <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Telefono usato in modo massiccio"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Tablet usato in modo massiccio"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Dispositivo usato in modo massiccio"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Circa <xliff:g id="HOUR">%1$s</xliff:g> di utilizzo dall\'ultima ricarica completa"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Il telefono è stato usato in modo massiccio ed è stata consumata molta batteria. Il comportamento della batteria è normale.\n\n Il telefono è stato usato per circa <xliff:g id="HOUR">%1$s</xliff:g> dall\'ultima ricarica completa.\n\n Utilizzo totale:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Il tablet è stato usato in modo massiccio ed è stata consumata molta batteria. Il comportamento della batteria è normale.\n\n Il tablet è stato usato per circa <xliff:g id="HOUR">%1$s</xliff:g> dall\'ultima ricarica completa.\n\n Utilizzo totale:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Il dispositivo è stato usato in modo massiccio ed è stata consumata molta batteria. Il comportamento della batteria è normale.\n\n Il dispositivo è stato usato per circa <xliff:g id="HOUR">%1$s</xliff:g> dall\'ultima ricarica completa.\n\n Utilizzo totale:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"Gestione batteria intelligente"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"Gestione automatica della batteria"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"Regola automaticamente il consumo di batteria delle app in base all\'utilizzo"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"App con limitazioni"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="other">%1$d app</item>
+      <item quantity="one">%1$d app</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"Arrestare l\'app?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Il telefono non può gestire normalmente la batteria perché l\'app <xliff:g id="APP">%1$s</xliff:g> lo mantiene attivo.\n\nProva a risolvere il problema interrompendo l\'app.\n\nSe il problema persiste, potresti dover disinstallare l\'app per migliorare le prestazioni della batteria."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Il tablet non può gestire normalmente la batteria perché l\'app <xliff:g id="APP">%1$s</xliff:g> lo mantiene attivo.\n\nProva a risolvere il problema interrompendo l\'app.\n\nSe il problema persiste, potresti dover disinstallare l\'app per migliorare le prestazioni della batteria."</string>
@@ -2142,6 +2184,7 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"MediaServer"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Ottimizzazione delle app"</string>
     <string name="battery_saver" msgid="8172485772238572153">"Risparmio energetico"</string>
+    <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Utilizza Risparmio energetico"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Attiva automaticamente"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Mai"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"al seguente livello di carica: <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2362,6 +2405,7 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"Rimuovere l\'account?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"La rimozione di questo account comporterà l\'eliminazione di tutti i relativi messaggi, contatti e altri dati dal tablet."</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"La rimozione di questo account comporterà l\'eliminazione di tutti i relativi messaggi, contatti e altri dati dal telefono."</string>
+    <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"La rimozione di questo account comporta l\'eliminazione di tutti i relativi messaggi, contatti e altri dati dal dispositivo."</string>
     <string name="remove_account_failed" msgid="3901397272647112455">"Questa modifica non è consentita dall\'amministratore"</string>
     <string name="provider_label" msgid="7724593781904508866">"Sottoscrizioni push"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2886,8 +2930,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blocca interruzioni visive"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Consenti segnali visivi"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"Aggiungi"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ATTIVA ORA"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"DISATTIVA ORA"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Attiva ora"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Disattiva ora"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"La funzione Non disturbare è attiva fino alle ore <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"La funzione Non disturbare rimarrà attiva fino alla disattivazione"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"La funzione Non disturbare è stata attivata automaticamente da una regola (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
@@ -2926,7 +2970,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Notifiche app"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoria della notifica"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"Gruppo di categorie di notifica"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"Importanza"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"Comportamento"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"Attiva audio"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Non mostrare mai notifiche"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Senza suoneria o interruzione visiva"</string>
@@ -2944,6 +2988,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Importanza media"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importanza elevata"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"Urgente"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"Mostra notifiche"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Assistente notifica"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Accesso alle notifiche"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Accosso bloccato alle notifiche del profilo di lavoro"</string>
@@ -2974,9 +3019,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Accesso Non disturbare"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nessuna delle app installate ha richiesto l\'accesso Non disturbare"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Caricamento app..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android sta bloccando la visualizzazione sul dispositivo delle notifiche dell\'app"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android sta bloccando la visualizzazione sul dispositivo di questa categoria di notifiche"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android sta bloccando la visualizzazione di questo gruppo di notifiche sul dispositivo in uso"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"Come richiesto, Android sta bloccando la visualizzazione delle notifiche dell\'app sul dispositivo in uso"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Come richiesto, Android sta bloccando la visualizzazione di questa categoria di notifiche sul dispositivo in uso"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Come richiesto, Android sta bloccando la visualizzazione di questo gruppo di notifiche sul dispositivo in uso"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categorie"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Altro"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3555,31 +3600,8 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"Riquadri sviluppatore per impostazioni rapide"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"Siamo qui per aiutarti"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Siamo a tua disposizione 24 ore su 24, 7 giorni su 7"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Siamo a tua disposizione 24 ore su 24, 7 giorni su 7"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"Il nostro team di assistenza è a disposizione per risolvere qualsiasi problema"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Il nostro team di assistenza è disponibile tutto il giorno, tutti i giorni"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Cerca nella Guida o chiamaci in orario d\'ufficio (ora locale):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Orari d\'ufficio per l\'assistenza telefonica (ora locale)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Cerca nella guida o leggi i suggerimenti"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"Supporto per:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"Stai viaggiando all\'estero?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"Potrebbero essere applicate tariffe internazionali"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefono"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Leggi i suggerimenti"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Cerca nella guida e invia feedback"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"Contatta l\'assistenza"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Accedi"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"Non riesci ad accedere?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"Invia informazioni sul sistema"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Non mostrare più"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"Richiesta come"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"Aggiungi account"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"Informazioni di sistema"</string>
+    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Traccia finestra"</string>
+    <string name="layer_trace_quick_settings_title" msgid="2447147947568109649">"Traccia livello"</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>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Consenti ricerche di contatti in base all\'organizzazione per identificare chiamanti e contatti"</string>
@@ -3595,11 +3617,11 @@
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> secondi</item>
       <item quantity="one">1 secondo</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Tempo di attesa: <xliff:g id="ESTIMATE">%1$s</xliff:g> circa"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Gestisci archiviazione"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Per liberare spazio, la gestione memoria rimuove foto e video dal dispositivo dopo averne eseguito il backup."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Rimuovi foto e video"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Gestione memoria"</string>
+    <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Utilizza Gestione archiviazione"</string>
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatiche"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuali"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Libera spazio ora"</string>
@@ -3765,8 +3787,8 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Scopri il tuo nuovo tablet"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Scopri il tuo nuovo dispositivo"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Questa funzione non è disponibile su questo dispositivo"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
-    <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
-    <skip />
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forza esecuzione completa delle misurazioni GNSS"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Monitora tutte le costellazioni e le frequenze GNSS senza ciclo di lavoro utile"</string>
+    <string name="storage_access" msgid="8905018810338984531">"Accesso allo spazio di archiviazione"</string>
+    <string name="keywords_storage_access" msgid="3708874088152933579">"directory per l\'accesso allo spazio di archiviazione"</string>
 </resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index d3ef68e..300b803 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"חלש"</item>
     <item msgid="2042505933058940139">"חלשה"</item>
@@ -260,7 +274,7 @@
     <item msgid="587124103118495063">"‏כתוב ICC SMS"</item>
     <item msgid="2320577158869025503">"שנה הגדרות"</item>
     <item msgid="1545733463471924009">"צייר מעל"</item>
-    <item msgid="3609046903962454582">"גש אל ההתראות"</item>
+    <item msgid="3609046903962454582">"גישה אל ההודעות"</item>
     <item msgid="4671646036128214513">"מצלמה"</item>
     <item msgid="1097324338692486211">"הקלט אודיו"</item>
     <item msgid="5031552983987798163">"הפעל את האודיו"</item>
@@ -327,7 +341,7 @@
     <item msgid="4370895547001583812">"‏כתוב SMS/MMS"</item>
     <item msgid="4218544235221631789">"שנה הגדרות"</item>
     <item msgid="736541391767350377">"צייר מעל"</item>
-    <item msgid="5530815681721654194">"גש אל ההתראות"</item>
+    <item msgid="5530815681721654194">"גישה אל ההודעות"</item>
     <item msgid="781213371706962767">"מצלמה"</item>
     <item msgid="1720492593061838172">"הקלט אודיו"</item>
     <item msgid="3493046322001257041">"הפעל את האודיו"</item>
@@ -340,7 +354,7 @@
     <item msgid="7983336752371254444">"עוצמת קול של צלצול"</item>
     <item msgid="7878027809189330917">"עוצמת קול של מדיה"</item>
     <item msgid="7260546305036218513">"עוצמת קול של התראה"</item>
-    <item msgid="9103719301075748925">"עוצמת קול של התראות"</item>
+    <item msgid="9103719301075748925">"עוצמת קול של הודעות"</item>
     <item msgid="7025966722295861512">"‏עוצמת קול של Bluetooth"</item>
     <item msgid="4665183401128289653">"שמור במצב פעיל"</item>
     <item msgid="8584357129746649222">"מיקום"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"בני למעלה מ-60 ימים"</item>
     <item msgid="5692284879054004388">"בני למעלה מ-90 ימים"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"שימוש בהעדפות רשת"</item>
+    <item msgid="8745603368609022803">"יש להתייחס כרשת נמדדת"</item>
+    <item msgid="2266114985518865625">"יש להתייחס כרשת לא נמדדת"</item>
+  </string-array>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 91b98d0..f5c9b1f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -172,6 +172,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"המכשירים שלך"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"התאמה של מכשיר חדש"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"‏יש לאפשר למכשיר לבצע התאמה ולהתחבר למכשירי Bluetooth"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"‏השבתת צלצולים בערוץ ה-Bluetooth‏ (in-band ringing)"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"‏השתקת רינגטונים של טלפון מותאמים אישית באוזניות Bluetooth"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"מחובר כעת"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"מכשירים שמורים"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"הוספת מכשיר"</string>
@@ -334,6 +336,16 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"הגדרת תאריך"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"מיין לפי סדר אלפביתי"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"מיין לפי אזור זמן"</string>
+    <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+    <skip />
+    <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+    <skip />
+    <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+    <skip />
     <string name="date_picker_title" msgid="1338210036394128512">"תאריך"</string>
     <string name="time_picker_title" msgid="483460752287255019">"שעה"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"נעילה אוטומטית"</string>
@@ -352,6 +364,8 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"פרטי פרופיל"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"חשבונות"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"מיקום"</string>
+    <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+    <skip />
     <string name="account_settings_title" msgid="626177544686329806">"חשבונות"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"אבטחה ומיקום"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"הצפנה ופרטי כניסה"</string>
@@ -713,6 +727,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"כטלפון דיבורית"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"עבור מוזיקה ומדיה"</string>
     <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="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>
@@ -727,6 +743,8 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"שם"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"‎2.4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"‎5 GHz"</string>
+    <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+    <skip />
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"‏<xliff:g id="REQUESTER">%s</xliff:g> רוצה להפעיל את ה-Wi-Fi"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"‏<xliff:g id="REQUESTER">%s</xliff:g> רוצה לכבות את ה-Wi-Fi"</string>
@@ -744,6 +762,8 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"‏הפעל את ה-Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+    <skip />
     <string name="wifi_settings_category" msgid="8719175790520448014">"‏הגדרות Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"הגדר ונהל נקודות גישה אלחוטיות"</string>
@@ -855,7 +875,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS זמין)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"הזן את סיסמת הרשת שלך"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"‏רשת Wi-Fi של ספק"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"חיבור לרשת של <xliff:g id="NAME">%1%s</xliff:g>"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"חיבור לרשת של <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"‏לשיפור דיוק המיקום ולמטרות אחרות, <xliff:g id="APP_NAME">%1$s</xliff:g> רוצה להפעיל את סריקת הרשתות, גם כאשר ה-Wi-Fi כבוי.\n\nהאם להתיר זאת עבור כל האפליקציות שרוצות לסרוק?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"כדי לכבות, עבור אל \'מתקדם\' באפשרויות הנוספות."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"כן, זה בסדר"</string>
@@ -933,10 +953,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"‏תדר AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"‏יש לך אפשרות להשתמש בנקודה לשיתוף אינטרנט כדי ליצור רשת Wi‑Fi ולחבר אליה את המכשירים האחרים. נקודות לשיתוף אינטרנט מספקות חיבור לאינטרנט דרך חבילת הגלישה שלך. ייתכן שהשימוש יהיה כרוך בתשלום נוסף על חבילת הגלישה."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"אפשר להשתמש באפליקציות כדי ליצור נקודה לשיתוף אינטרנט ולשתף תכנים בין מכשירים שנמצאים בקרבת מקום."</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"כיבוי אוטומטי של נקודה לשיתוף אינטרנט"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"‏נקודת ה-Wi‑Fi לשיתוף אינטרנט תיכבה כשאין אף מכשיר מחובר"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"מפעיל נקודה לשיתוף אינטרנט…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"מכבה נקודה לשיתוף אינטרנט…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> פעיל"</string>
@@ -985,6 +1003,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"כתובת למקרה חירום"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"‏משמש כמיקומך בעת ביצוע שיחת חירום באמצעות רשת Wi-Fi"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958">"‏"<annotation id="url">"מידע נוסף"</annotation>" על תכונות של DNS פרטי"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"תצוגה"</string>
     <string name="sound_settings" msgid="5534671337768745343">"צלילים"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"עוצמות קול"</string>
@@ -994,7 +1013,7 @@
     <string name="notification_sound_title" msgid="5137483249425507572">"צליל ברירת מחדל להתראה"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"צלצול"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"התראה"</string>
-    <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"השתמש בעוצמת הקול של שיחות נכנסות להתראות"</string>
+    <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"השתמש בעוצמת הקול של שיחות נכנסות להודעות"</string>
     <string name="home_work_profile_not_supported" msgid="1357721012342357037">"לא תומך בפרופילים של עבודה"</string>
     <string name="notification_sound_dialog_title" msgid="3805140135741385667">"צליל ברירת מחדל להתראה"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"מדיה"</string>
@@ -1007,12 +1026,12 @@
     <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"רטט בעת הקשה"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"ביטול רעש"</string>
     <string name="volume_media_description" msgid="7949355934788807863">"פריטי מוזיקה, סרטוני וידאו, משחקים ומדיה נוספת"</string>
-    <string name="volume_ring_description" msgid="5936851631698298989">"רינגטונים והתראות"</string>
-    <string name="volume_notification_description" msgid="5810902320215328321">"התראות"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"רינגטונים והודעות"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"הודעות"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"התראות"</string>
-    <string name="volume_ring_mute" msgid="3018992671608737202">"השתק רינגטון והתראות"</string>
+    <string name="volume_ring_mute" msgid="3018992671608737202">"השתק רינגטון והודעות"</string>
     <string name="volume_media_mute" msgid="3399059928695998166">"השתק מוזיקה וסוגי מדיה אחרים"</string>
-    <string name="volume_notification_mute" msgid="7955193480006444159">"השתק התראות"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"השתק הודעות"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"השתק התראות קוליות"</string>
     <string name="dock_settings" msgid="1820107306693002541">"עגינה"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"הגדרות עגינה"</string>
@@ -1334,6 +1353,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"ה-<xliff:g id="NAME">^1</xliff:g> החדש עובד. \n\nכדי להעביר תמונות, קבצים ונתוני אפליקציות למכשיר, עבור אל \'הגדרות\' ו\'אחסון\'."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"העברת <xliff:g id="APP">^1</xliff:g>"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"העברת <xliff:g id="APP">^1</xliff:g> והנתונים שבה אל <xliff:g id="NAME_0">^2</xliff:g> אורכת מספר דקות בלבד. לא תוכל להשתמש באפליקציה לפני השלמת ההעברה. \n\nאל תסיר את ה-<xliff:g id="NAME_1">^2</xliff:g> במהלך ההעברה."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"כדי להעביר נתונים יש לבטל את נעילת המשתמש <xliff:g id="APP">^1</xliff:g>."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"העברת <xliff:g id="APP">^1</xliff:g>…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"אל תסיר את ה-<xliff:g id="NAME">^1</xliff:g> במהלך ההעברה. \n\nהאפליקציה <xliff:g id="APP">^2</xliff:g> לא תהיה זמינה במכשיר לפני השלמת ההעברה."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ביטול העברה"</string>
@@ -1494,6 +1514,8 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"מקורות מיקום"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"מידע על הטאבלט"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"מידע על הטלפון"</string>
+    <!-- no translation found for about_settings (6717640957897546887) -->
+    <skip />
     <string name="about_settings" product="emulator" msgid="221313099578564438">"מידע על מכשיר במדמה"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"הצג מידע משפטי, סטטוס, גרסת תוכנה"</string>
     <string name="legal_information" msgid="5769301644270604095">"מידע משפטי"</string>
@@ -1601,6 +1623,8 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"הצגת כל <xliff:g id="COUNT">%1$d</xliff:g> האפליקציות"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"הטאבלט והנתונים האישיים שלך פגיעים יותר להתקפות של אפליקציות לא מוכרות. על ידי התקנת אפליקציות ממקור זה, אתה מסכים לכך שאתה האחראי לכל נזק לטאבלט או לכל אובדן של נתונים שעשויים להיגרם כתוצאה מהשימוש באפליקציות אלה."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"הטלפון והנתונים האישיים שלך פגיעים יותר להתקפות של אפליקציות לא מוכרות. על ידי התקנת אפליקציות ממקור זה, אתה מסכים לכך שאתה האחראי לכל נזק לטלפון או לכל אובדן של נתונים שעשויים להיגרם כתוצאה מהשימוש באפליקציות אלה."</string>
+    <!-- no translation found for install_all_warning (3648003301476423145) -->
+    <skip />
     <string name="advanced_settings" msgid="1777249286757067969">"הגדרות מתקדמות"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"אפשר עוד אפשרויות הגדרה."</string>
     <string name="application_info_label" msgid="5736524913065714880">"פרטי אפליקציות"</string>
@@ -1716,7 +1740,7 @@
     <string name="app_disable_dlg_text" msgid="5632072173181990531">"‏אם תשבית את האפליקציה הזו, ייתכן ש-Android ואפליקציות אחרות לא יפעלו כצפוי."</string>
     <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"האם למחוק נתונים ולהשבית את האפליקציה?"</string>
     <string name="app_special_disable_dlg_text" msgid="5832078825810635913">"‏אם תשבית את האפליקציה הזו, ייתכן ש-Android ואפליקציות אחרות לא יפעלו כצפוי. בנוסף, הנתונים שלך יימחקו."</string>
-    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"האם לבטל התראות?"</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"האם לבטל הודעות?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"אם תבטל התרעות עבור אפליקציה זו, אתה עלול להחמיץ התרעות ועדכונים חשובים."</string>
     <string name="app_install_details_group_title" msgid="7084623031296083574">"חנות"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"פרטי האפליקציה"</string>
@@ -1902,6 +1926,12 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"עשוי להשפיע על הביצועים"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"לחיצה אחרי שהמצביע מפסיק לזוז"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"השהייה לפני לחיצה"</string>
+    <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+    <skip />
+    <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+    <skip />
+    <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+    <skip />
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"מופעל"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"כבוי"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"הצג בהגדרות מהירות"</string>
@@ -1978,7 +2008,7 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"מאחר שהפעלת <xliff:g id="SERVICE">%1$s</xliff:g> משפיעה על הצפנת הנתונים, עליך לאשר את קוד הגישה שלך."</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="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="accessibility_no_services_installed" msgid="7200948194639038807">"אין שירותים מותקנים"</string>
@@ -2072,14 +2102,39 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"המכשיר יוצא ממצב שינה ברקע"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"בקשות מיקום בתדירות גבוהה"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> אפליקציות פועלות בצורה חריגה"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"הסוללה במצב טוב"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"האפליקציות מתנהגות באופן רגיל"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"קיבולת הסוללה נמוכה"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"הסוללה לא יכולה לספק חיי סוללה טובים"</string>
+    <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+    <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"שימוש תובעני בטלפון"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"שימוש תובעני בטאבלט"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"שימוש תובעני במכשיר"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"שימוש של בערך <xliff:g id="HOUR">%1$s</xliff:g> מאז הטעינה האחרונה"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"צריכת האנרגיה מהסוללה הייתה גבוהה בגלל שימוש תובעני בטלפון. התנהגות הסוללה היא רגילה.\n\n השתמשת בטלפון בערך <xliff:g id="HOUR">%1$s</xliff:g> מאז הטעינה המלאה האחרונה.\n\n סך הכל שימוש:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"צריכת האנרגיה מהסוללה הייתה גבוהה בגלל שימוש תובעני בטאבלט. התנהגות הסוללה היא רגילה.\n\n השתמשת בטאבלט בערך <xliff:g id="HOUR">%1$s</xliff:g> מאז הטעינה המלאה האחרונה.\n\n סך הכל שימוש:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"צריכת האנרגיה מהסוללה הייתה גבוהה בגלל שימוש תובעני במכשיר. התנהגות הסוללה היא רגילה.\n\n השתמשת במכשיר בערך <xliff:g id="HOUR">%1$s</xliff:g> מאז הטעינה המלאה האחרונה.\n\n סך הכל שימוש:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"מנהל סוללה חכם"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"ניהול סוללה אוטומטי"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"התאמה אוטומטית של צריכת הסוללה על ידי אפליקציות, על בסיס שימוש"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"אפליקציות בשימוש מוגבל"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="two">‏%1$d אפליקציות</item>
+      <item quantity="many">‏%1$d אפליקציות</item>
+      <item quantity="other">‏%1$d אפליקציות</item>
+      <item quantity="one">אפליקציה אחת</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"לעצור את האפליקציה?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"הניהול של צריכת הסוללה בטלפון לא תקין, כי האפליקציה <xliff:g id="APP">%1$s</xliff:g> לא מאפשרת למכשיר להיכנס למצב שינה.\n\nכדי לפתור את הבעיה, ניתן להפסיק את פעולת האפליקציה.\n\nאם הבעיה תימשך, ייתכן שיהיה עליך להסיר את התקנת האפליקציה כדי לשפר את ביצועי הסוללה."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"הניהול של צריכת הסוללה בטאבלט לא תקין, כי האפליקציה <xliff:g id="APP">%1$s</xliff:g> לא מאפשרת למכשיר להיכנס למצב שינה.\n\nכדי לפתור את הבעיה, ניתן להפסיק את פעולת האפליקציה.\n\nאם הבעיה תימשך, ייתכן שיהיה עליך להסיר את התקנת האפליקציה כדי לשפר את ביצועי הסוללה."</string>
@@ -2188,6 +2243,8 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"אופטימיזציית אפליקציה"</string>
     <string name="battery_saver" msgid="8172485772238572153">"חיסכון בסוללה"</string>
+    <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+    <skip />
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"הפעלה אוטומטית"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"אף פעם"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"סוללה ברמת טעינה של <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2408,6 +2465,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"להסיר את החשבון?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"הסרת חשבון זה תגרום להסרת כל ההודעות, אנשי הקשר ונתונים נוספים מהטאבלט!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"הסרת חשבון זה תגרום למחיקה של כל ההודעות, אנשי הקשר ונתונים נוספים של החשבון מהטלפון!"</string>
+    <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+    <skip />
     <string name="remove_account_failed" msgid="3901397272647112455">"מנהל המכשיר אינו מתיר שינוי זה"</string>
     <string name="provider_label" msgid="7724593781904508866">"‏מנויי Push"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2487,7 +2546,7 @@
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"‏שינויים שתבצע בחשבונות שלך באינטרנט יועתקו באופן אוטומטי לטאבלט שלך.\n\nייתכן גם שחשבונות מסוימים יעתיקו לאינטרנט באופן אוטומטי שינויים שתבצע בטלפון. חשבון Google פועל באופן זה."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"‏כל שינוי שתבצע בחשבונות שלך באינטרנט יועתק לטלפון שלך באופן אוטומטי.\n\nייתכן גם שחשבונות מסוימים יעתיקו לאינטרנט באופן אוטומטי שינויים שתבצע בטלפון. חשבון Google פועל באופן זה."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"האם לכבות סנכרון אוטומטי של נתונים?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"פעולה זו תחסוך בשימוש בנתונים ובעוצמת סוללה, אך יהיה עליך לסנכרן כל חשבון באופן ידני על מנת לאסוף מידע עדכני. בזמן עדכונים לא יתקבלו התראות."</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"פעולה זו תחסוך בשימוש בנתונים ובעוצמת סוללה, אך יהיה עליך לסנכרן כל חשבון באופן ידני על מנת לאסוף מידע עדכני. בזמן עדכונים לא יתקבלו הודעות."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"תאריך איפוס של מחזור שימוש"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"תאריך בכל חודש:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"הגדר"</string>
@@ -2723,7 +2782,7 @@
     <string name="restriction_settings_title" msgid="4233515503765879736">"הגבלות"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"הסר הגבלות"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"שנה קוד גישה"</string>
-    <string name="app_notifications_switch_label" msgid="9124072219553687583">"הצג התראות"</string>
+    <string name="app_notifications_switch_label" msgid="9124072219553687583">"הצג הודעות"</string>
     <string name="help_label" msgid="6886837949306318591">"עזרה ומשוב"</string>
     <string name="support_summary" msgid="2705726826263742491">"מאמרי עזרה, תמיכה טלפונית ותמיכה בצ\'אט, תחילת העבודה"</string>
     <string name="user_account_title" msgid="1127193807312271167">"חשבון לתוכן"</string>
@@ -2946,8 +3005,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"חסימת הפרעות חזותיות"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"הפעלת אותות חזותיים"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"הוספה"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"יש להפעיל עכשיו"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"יש לכבות עכשיו"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"הפעלה עכשיו"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"כיבוי עכשיו"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"המצב \'נא לא להפריע\' מופעל עד <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"המצב \'נא לא להפריע\' ימשיך לפעול עד שתכבו אותו"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"המצב \'נא לא להפריע\' הופעל אוטומטית על ידי הכלל <xliff:g id="RULE_NAME">%s</xliff:g>"</string>
@@ -2986,7 +3045,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"הודעות אפליקציה"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"קטגוריית הודעות"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"קבוצת קטגוריות של הודעות"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"חשיבות"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"התנהגות"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"הפעלת צליל"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"לעולם אל תציג הודעות"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ללא צליל וללא הפרעה ויזואלית"</string>
@@ -3004,10 +3063,11 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"חשיבות בינונית"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"חשיבות גבוהה"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"חשיבות דחופה"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"הצגת הודעות"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"אסיסטנט ההודעות"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"גישה אל הודעות"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"הגישה להודעות של פרופיל העבודה חסומה"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"אפליקציות לא יכולות לקרוא התראות"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"אפליקציות לא יכולות לקרוא הודעות"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
       <item quantity="two">‏%d אפליקציות יכולות לקרוא הודעות</item>
       <item quantity="many">‏%d אפליקציות יכולות לקרוא הודעות</item>
@@ -3036,9 +3096,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"גישה אל \'נא לא להפריע\'"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"אין אפליקציות מותקנות שביקשו גישה אל \'נא לא להפריע\'"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"טוען אפליקציות..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"‏מערכת Android לא מאפשרת להודעות מהאפליקציה הזאת להופיע במסך"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"‏מערכת Android לא מאפשרת להודעות מהקטגוריה הזאת להופיע במסך"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"‏מערכת Android לא מאפשרת להודעות מהקבוצה הזאת להופיע במכשיר הזה"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"‏לבקשתך, מערכת Android חוסמת במכשיר זה הצגת הודעות מאפליקציה זו"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"‏לבקשתך, מערכת Android חוסמת במכשיר הצגה של קטגוריית הודעות זו"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"‏לבקשתך, מערכת Android חוסמת במכשיר הצגה של מקבץ הודעות זה"</string>
     <string name="notification_channels" msgid="5346841743182627500">"קטגוריות"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"אחר"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3047,7 +3107,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> קטגוריות</item>
       <item quantity="one">קטגוריה אחת (<xliff:g id="COUNT_0">%d</xliff:g>)</item>
     </plurals>
-    <string name="no_channels" msgid="3077375508177744586">"האפליקציה הזו לא שלחה התראות"</string>
+    <string name="no_channels" msgid="3077375508177744586">"האפליקציה הזו לא שלחה הודעות"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"הגדרות נוספות באפליקציה"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"מופעל עבור כל האפליקציות"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="5668835155965827890">
@@ -3190,7 +3250,7 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"ניתן להגביר את ההגנה על המכשיר על ידי דרישה להזנת סיסמה לפני שהוא מופעל. עד שהמכשיר יופעל, הוא לא יוכל לקבל שיחות, הודעות או התראות, כולל התראות קוליות. \n\nהדבר יסייע להגן על נתונים במכשירים שאבדו או נגנבו. האם לדרוש סיסמה כדי להפעיל את המכשיר?"</string>
     <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"בנוסף לשימוש בטביעת אצבע כדי לבטל את הנעילה של המכשיר, ניתן להגביר את ההגנה עליו על ידי דרישה להזנת קוד גישה לפני שהוא מופעל. עד שהמכשיר יופעל, הוא לא יוכל לקבל שיחות, הודעות או התראות, כולל התראות קוליות.\n\nהדבר יסייע להגן על נתונים במכשירים שאבדו או נגנבו. האם לדרוש הזנה של קוד גישה כדי להפעיל את המכשיר?"</string>
     <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"בנוסף לשימוש בטביעת אצבע כדי לבטל את הנעילה של המכשיר, ניתן להגביר את ההגנה עליו על ידי דרישה לסמן את קו ביטול הנעילה לפני שהוא מופעל. עד שהמכשיר יופעל, הוא לא יוכל לקבל שיחות, הודעות או התראות, כולל התראות קוליות.\n\nהדבר יסייע להגן על נתונים במכשירים שאבדו או נגנבו. האם לדרוש סימון של קו ביטול הנעילה כדי להפעיל את המכשיר?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"כדי לשפר את רמת האבטחה של המכשיר בנוסף לביטול הנעילה באמצעות טביעת אצבע, תוכל להגדיר את המכשיר כך שתידרש להזין סיסמה לפני הפעלתו. עד להפעלה של המכשיר, לא ניתן לקבל שיחות, הודעות או התראות.\n\nכך, תוכל להגן על הנתונים אם המכשיר ייגנב או יאבד. לדרוש סיסמה להפעלת המכשיר?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"כדי לשפר את רמת האבטחה של המכשיר בנוסף לביטול הנעילה באמצעות טביעת אצבע, תוכל להגדיר את המכשיר כך שתידרש להזין סיסמה לפני הפעלתו. עד להפעלה של המכשיר, לא ניתן לקבל שיחות, הודעות או הודעות.\n\nכך, תוכל להגן על הנתונים אם המכשיר ייגנב או יאבד. לדרוש סיסמה להפעלת המכשיר?"</string>
     <string name="encryption_interstitial_yes" msgid="4439509435889513411">"כן"</string>
     <string name="encryption_interstitial_no" msgid="8935031349097025137">"לא"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"לדרוש קוד גישה?"</string>
@@ -3653,31 +3713,10 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"מחובר לכמה התקנים"</string>
     <string name="demo_mode" msgid="2798762752209330277">"מצב הדגמה בממשק המשתמש של המערכת"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"משבצות מפתח להגדרות מהירות"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"אנחנו כאן לשירותך"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"אנחנו כאן בשבילך, 24 שעות ביממה"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"אנחנו כאן בשבילך, 24 שעות ביממה"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"צוות התמיכה שלנו נמצא כאן כדי לעזור בטיפול בכל בעיה"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"צוות התמיכה שלנו זמין כל היום, בכל יום"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"‏חפש עזרה או חזור במהלך שעות התמיכה (זמן מקומי):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"‏שעות הפעילות של התמיכה הטלפונית (זמן מקומי)‏&lt;br&gt;&lt;b&gt;‏<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"יש לנו טיפים מעולים בשבילך"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"תמיכה עבור:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"נוסע לחו\"ל?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"ייתכנו חיובים בינלאומיים"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"טלפון"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"צ\'אט"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"טיפים וטריקים מעולים"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"חפש בנושאי העזרה ושלח משוב"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"יצירת קשר עם התמיכה"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"כניסה"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"לא מצליח להיכנס?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"שליחת פרטי מערכת"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"אל תציג שוב"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"מבקש בשם"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"הוספת חשבון"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"נתוני מערכת"</string>
+    <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+    <skip />
+    <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+    <skip />
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"הגדרות של פרופיל עבודה"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"חיפוש אנשי קשר"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"אפשר לחיפושי אנשי קשר שמבצע הארגון לזהות מתקשרים ואנשי קשר"</string>
@@ -3699,11 +3738,12 @@
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> שניות</item>
       <item quantity="one">שנייה אחת</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"המתנה של ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"ניהול אחסון"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"כדי לעזור בפינוי שטח אחסון, מנהל האחסון מסיר מהמכשיר שלך תמונות וסרטונים מגובים."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"הסרת תמונות וסרטונים"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"מנהל אחסון"</string>
+    <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+    <skip />
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"באופן אוטומטי"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"ידני"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"פינוי שטח אחסון עכשיו"</string>
@@ -3725,20 +3765,20 @@
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"הקשה כפולה לבדיקת הטאבלט"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"הקשה כפולה לבדיקת המכשיר"</string>
     <string name="ambient_display_summary" msgid="525662960806416373">"כדי לבדוק מה השעה, לבדוק אם יש סמלי הודעות ולראות מידע נוסף, פשוט צריך להקיש פעמיים על המסך."</string>
-    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"בדיקת התראות כשהמסך כבוי"</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"בדיקת הודעות כשהמסך כבוי"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"הרמה לבדיקת הטלפון"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"הרמה לבדיקת הטאבלט"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"הרמה לבדיקת המכשיר"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"כדי לבדוק מה השעה, לבדוק אם יש סמלי הודעות ולראות מידע נוסף, פשוט צריך להרים את הטלפון."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"כדי לבדוק מה השעה, לבדוק אם יש סמלי הודעות ולראות מידע נוסף, פשוט צריך להרים את הטאבלט."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"כדי לבדוק מה השעה, לבדוק אם יש סמלי הודעות ולראות מידע נוסף, פשוט צריך להרים את המכשיר."</string>
-    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"בדיקת התראות כשהמסך כבוי"</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"בדיקת הודעות כשהמסך כבוי"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"החלקה לקריאת הודעות"</string>
     <string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"החלקה של טביעת אצבע"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"כדי לבדוק הודעות יש להחליק כלפי מטה בחיישן טביעות האצבע שבחלק האחורי של הטלפון."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"כדי לבדוק הודעות יש להחליק כלפי מטה בחיישן טביעות האצבע שבחלק האחורי של הטאבלט."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"כדי לבדוק הודעות יש להחליק כלפי מטה בחיישן טביעות האצבע שבחלק האחורי של המכשיר."</string>
-    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"הצגת התראות במהירות"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"הצגת הודעות במהירות"</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"החלקה למטה על חיישן טביעות האצבע"</string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"פועל"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"כבוי"</string>
@@ -3883,8 +3923,10 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"סיור היכרות עם הטאבלט החדש"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"סיור היכרות עם המכשיר החדש"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"התכונה לא זמינה במכשיר הזה"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"‏אילוץ של הרצה מלאה של מדידות Gnss"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"‏מעקב אחר כל מערכות הניווט והתדרים של GNSS ללא מחזור פעילות"</string>
+    <!-- no translation found for storage_access (8905018810338984531) -->
     <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+    <!-- no translation found for keywords_storage_access (3708874088152933579) -->
     <skip />
 </resources>
diff --git a/res/values-kk/arrays.xml b/res/values-kk/arrays.xml
index b5707f2..80dff56 100644
--- a/res/values-kk/arrays.xml
+++ b/res/values-kk/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Нашар"</item>
     <item msgid="2042505933058940139">"Нашар"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"60 күн бұрын"</item>
     <item msgid="5692284879054004388">"90 күн бұрын"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"Желі параметрін пайдалану"</item>
+    <item msgid="8745603368609022803">"Шектеулі"</item>
+    <item msgid="2266114985518865625">"Шектеусіз"</item>
+  </string-array>
 </resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 1e1ac01..b54c9a2 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Құрылғыларыңыз"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Жаңа құрылғымен жұптастыру"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"Құрылғыға жұптауға және Bluetooth құрылғыларына қосылуға рұқсат беру"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Жолақ ішілік қоңырау әуенін өшіру"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Bluetooth гарнитураларында арнаулы телефон рингтондарын ойнатпау"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Қосулы құрылғылар"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"Сақталған құрылғылар"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"Құрылғы қосу"</string>
@@ -330,6 +332,16 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"Күнді реттеу"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Әліппе бойынша сұрыптау"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Уақыт белдеуі бойынша сұрыптау"</string>
+    <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+    <skip />
+    <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+    <skip />
+    <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+    <skip />
     <string name="date_picker_title" msgid="1338210036394128512">"Күн-айы"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Уақыт"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Aвтоматты құлыптау"</string>
@@ -348,6 +360,8 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Профильдік ақпарат"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Есептік жазбалар"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Орын"</string>
+    <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+    <skip />
     <string name="account_settings_title" msgid="626177544686329806">"Есептік жазбалар"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"Қауіпсіздік және орналасқан жер"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифрлау және тіркелу деректері"</string>
@@ -691,6 +705,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Үндеткіш телефоны ретінде"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Музыка және медиа үшін"</string>
     <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="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>
@@ -705,6 +721,8 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Атауы"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 ГГц"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 ГГц"</string>
+    <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+    <skip />
     <string name="link_speed" msgid="8896664974117585555">"%1$d Мб/с"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fi желісінің қосылуын сұрайды"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fi желісінің өшірілуін сұрайды"</string>
@@ -722,6 +740,8 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi‑Fi қосу"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+    <skip />
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi параметрлері"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Сымсыз қол жетімділік нүктесін орнату және басқару"</string>
@@ -833,7 +853,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS қол жетімді)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Желі құпия сөзін енгізіңіз"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"Оператордың Wi‑Fi желісі"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> арқылы қосу"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> арқылы қосу"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Аймақ нақтылығын жақсарту және басқа мақсаттар үшін, <xliff:g id="APP_NAME">%1$s</xliff:g> қолданбасы желі тексеруді қосуды қалайды, Wi-Fi өшіріліп тұрса да.\n\nЖелі тексергісі келетеін барлық қолданбаларға рұқсат берілсін бе?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Мұны өшіру үшін артылған мазмұндар мәзірінде «Кеңейтілген» тармағына өтіңіз."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Рұқсат беру"</string>
@@ -909,10 +929,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP диапазоны"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Басқа құрылғыларға Wi‑Fi желісін жасау үшін хотспотты пайдаланыңыз. Хотспот мобильдік деректер байланысы арқылы интернетке қосады. Қосымша мобильдік деректер ақысы алынуы мүмкін."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Қолданбалар мазмұнды маңайдағы құрылғылармен бөлісу үшін хоспот жасай алады."</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Хотспотты автоматты өшіру"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Wi‑Fi хотспотына ешқандай құрылғы қосылмаса, ол өшеді"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Хотспот қосылуда…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Хотспот өшірілуде…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> қосулы"</string>
@@ -961,6 +979,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"Төтенше жағдайда пайдаланылатын мекенжай"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Wi‑Fi арқылы жедел қызметке қоңырау шалғанда орналасқан орныңыз ретінде пайдаланылады"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958">"Жеке DNS функциялары туралы "<annotation id="url">"толығырақ"</annotation></string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Дыбыс"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Дыбыс қаттылығы"</string>
@@ -1308,6 +1327,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Жаңа <xliff:g id="NAME">^1</xliff:g> жұмыс істеп тұр. \n\nФотосуреттерді, файлдарды және қолданба деректерін осы құрылғыға аудару үшін Параметрлер &gt; Жад тармағына өтіңіз."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> қолданбасын аудару"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> және оның деректерін <xliff:g id="NAME_0">^2</xliff:g> құрылғысына аударуға көп уақыт кетпейді. Деректер аударылып болмайынша, қолданба пайдаланылмайды. \n\nАудару барысында <xliff:g id="NAME_1">^2</xliff:g> ұясынан шығарылмауы керек."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Деректерді тасымалдау үшін <xliff:g id="APP">^1</xliff:g> пайдаланушысының құлпын ашу керек."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> аударылуда…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Аудару барысында <xliff:g id="NAME">^1</xliff:g> ұясынан шығарылмауы керек. \n\nОсы құрылғыдағы <xliff:g id="APP">^2</xliff:g> аударылып біткенше істемей тұрады."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Аударудан бас тарту"</string>
@@ -1468,6 +1488,8 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"Орын дереккөздері"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Планшет туралы"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Телефон туралы"</string>
+    <!-- no translation found for about_settings (6717640957897546887) -->
+    <skip />
     <string name="about_settings" product="emulator" msgid="221313099578564438">"Эмуляцияланған құрылғы туралы"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Заңнамалық ақпарат, күйін, бағдарлама нұсқасын қарау"</string>
     <string name="legal_information" msgid="5769301644270604095">"Заңнамалық ақпараттар"</string>
@@ -1575,6 +1597,8 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"Барлық <xliff:g id="COUNT">%1$d</xliff:g> қолданбаны көру"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Планшет және жеке деректер белгісіз қолданбалар шабуылына ұшырауы мүмкін. Бұл қолданбаларды пайдалану нәтижесінде телефонға келетін залалға немесе деректердің жоғалуына өзіңіз ғана жауапты боласыз."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Телефон және жеке деректер белгісіз қолданбалар шабуылына ұшырауы мүмкін. Бұл қолданбаларды пайдалану нәтижесінде телефонға келетін залалға немесе деректердің жоғалуына өзіңіз ғана жауапты боласыз."</string>
+    <!-- no translation found for install_all_warning (3648003301476423145) -->
+    <skip />
     <string name="advanced_settings" msgid="1777249286757067969">"Қосымша параметрлер"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Басқа параметр опцияларын қосу"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Қолданба ақпараты"</string>
@@ -1874,6 +1898,12 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Жұмыс өнімділігіне әсерін тигізуі мүмкін"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Меңзер тоқтағаннан кейін басу"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Басу алдындағы кешігу"</string>
+    <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+    <skip />
+    <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+    <skip />
+    <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+    <skip />
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ҚОСУЛЫ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ӨШІРУЛІ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Жылдам параметрлер арқылы көрсету"</string>
@@ -2030,14 +2060,37 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Құрылғыны фондық режимде ояту"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Орналасу орны ақпаратын жиі сұрауда"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> қолданба оғаш әрекет етуде"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Батарея жақсы күйде"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Қолданбалар қалыпты жұмыс істеп тұр"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Батарея заряды аз қалды"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Батарея заряды ұзаққа жетпейді"</string>
+    <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+    <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Телефон ұзақ пайдаланылды"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Планшет ұзақ пайдаланылды"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Құрылғы ұзақ пайдаланылды"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Соңғы толық зарядталғаннан бері шамамен <xliff:g id="HOUR">%1$s</xliff:g> сағат пайдаланылды"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Телефоныңыз ұзақ пайдаланылды және оған көп батарея заряды кетті. Батерея қалыпты күйде.\n\n Соңғы толық зарядталғаннан бері телефоныңыз шамамен <xliff:g id="HOUR">%1$s</xliff:g> сағат пайдаланылды.\n\n Жалпы пайдалануы:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Планшетіңіз ұзақ пайдаланылды және оған көп батарея заряды кетті. Батерея қалыпты күйде.\n\n Соңғы толық зарядталғаннан бері планшетіңіз шамамен <xliff:g id="HOUR">%1$s</xliff:g> сағат пайдаланылды.\n\n Жалпы пайдалануы:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Құрылғыңыз ұзақ пайдаланылды және оған көп батарея заряды кетті. Батерея қалыпты күйде.\n\n Соңғы толық зарядталғаннан бері құрылғыңыз шамамен <xliff:g id="HOUR">%1$s</xliff:g> сағат пайдаланылды. \n\n Жалпы пайдаланылуы:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"Ақылды батарея басқарушысы"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"Батареяны автоматты басқару"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"Қолданбалардың пайдалануы негізінде қуат тұтынуды автоматты реттеу"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"Тыйым салынған қолданбалар"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="other">%1$d қолданба</item>
+      <item quantity="one">%1$d қолданба</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"Қолданба тоқтатылсын ба?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Телефоныңыз батареяны қалыпты басқара алмайды, себебі <xliff:g id="APP">%1$s</xliff:g> қолданбасы оны қосулы күйде ұстауда.\n\nБұл мәселені шешу үшін қолданбаны тоқтатуыңызға болады.\n\nМұндай жағдай қайталана берсе, батарея жұмысын жақсарту үшін қолданбаны жою қажет болуы мүмкін."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Планшетіңіз батареяны қалыпты басқара алмайды, себебі <xliff:g id="APP">%1$s</xliff:g> қолданбасы оны қосулы күйде ұстауда.\n\nБұл мәселені шешу үшін қолданбаны тоқтатуыңызға болады.\n\nМұндай жағдай қайталана берсе, батарея жұмысын жақсарту үшін қолданбаны жою қажет болуы мүмкін."</string>
@@ -2146,6 +2199,8 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Meдиасервері"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Қолданбаны оңтайландыру"</string>
     <string name="battery_saver" msgid="8172485772238572153">"Battery Saver"</string>
+    <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+    <skip />
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Автоматты түрде қосу"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Ешқашан"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"батарея заряды <xliff:g id="PERCENT">%1$s</xliff:g> болғанда"</string>
@@ -2366,6 +2421,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"Есептік жазба алынсын ба?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Бұл есептік жазбаны алып тастау нәтижесінде оның хабарлары, контактілері және басқа планшет деректері жойылады!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Бұл есептік жазбаны алып тастаса, телефоннан барлық хабарлар, контактілер мен басқа деректер жойылады!"</string>
+    <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+    <skip />
     <string name="remove_account_failed" msgid="3901397272647112455">"Әкімші бұл өзгертуге рұқсат бермеген"</string>
     <string name="provider_label" msgid="7724593781904508866">"Итеру жазылымдары"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2890,8 +2947,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Көрнекі мазалағыштарды бөгеу"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Визуалды сигналдарды қосу"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"Қосу"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ҚАЗІР ҚОСУ"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"ҚАЗІР ӨШІРУ"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Қазір қосу"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Қазір өшіру"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"\"Мазаламау\" режимі <xliff:g id="FORMATTED_TIME">%s</xliff:g> дейін қосулы болады"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"\"Мазаламау\" режимі өшірілгенше қосулы болады"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"\"Мазаламау\" режимі \"<xliff:g id="RULE_NAME">%s</xliff:g>\" ережесі арқылы автоматты түрде қосылды"</string>
@@ -2930,7 +2987,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Қолданба хабар-лары"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Хабарландыру санаты"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"Хабарландыру санатының тобы"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"Маңыздылық"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"Іс-әрекет"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"Дыбысқа рұқсат ету"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Хабарландыруларды ешқашан көрсетпеу"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Дыбыссыз және визуалдық кедергісіз"</string>
@@ -2948,6 +3005,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Орташа маңыздылық"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Жоғары маңыздылық"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"Шұғыл маңыздылық"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"Хабарландыруларды көрсету"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Хабарландыру көмекшісі"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Хабарландыруға кіру мүмкіндігі"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Жұмыс профилінің хабарландыруларына кіру бөгелген"</string>
@@ -2978,9 +3036,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Мазаламау режиміне кіру"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Орнатылған қолданбалардың ешбірі Мазаламау режиміне кіруге рұқсат сұрамады"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Қолданбаларды жүктеу…"</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android қолданба хабарландыруларының құрылғыда шығуын бөгейді."</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android хабарландырулардың осы санатының құрылғыда шығуын бөгейді"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android хабарландырулардың осы тобының құрылғыда шығуын бөгейді"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"Сұрауыңыз бойынша Android бұл құрылғыда мұндай қолданба хабарландыруларының шығуын бөгеуде"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Сұрауыңыз бойынша Android бұл құрылғыда мұндай санаттағы хабарландыруларды бөгейді"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Сұрауыңыз бойынша Android бұл құрылғыда мұндай хабарландырулар тобын бөгейді"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Санаттар"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Басқа"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3559,31 +3617,10 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Түрлі құрылғыларға қосылған"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Жүйе интерфейсінің демо режимі"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Әзірлеуші блоктарының жылдам параметрлері"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"Көмектесуге әрқашан дайынбыз"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Біз сізге аптасына 7 күн 24 сағат бойы көмек көрсетуге дайынбыз"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Біз тәулік бойы демалыссыз жұмыс істейміз"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"Қолдау қызметі кез келген мәселе бойынша көмектесуге дайын"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Біздің қолдау көрсету ұжымы кез келген күні тәулік бойы қызмет көрсетуге дайын"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Анықтамадан іздеп көріңіз немесе жұмыс уақыты (жергілікті уақыт) кезінде хабарласыңыз:&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Телефон қоңыраулары қабылданатын кез (жергілікті уақыт)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Іздеу анықтамасы немесе зерттеу кеңестері және тәсілдері"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"Қолдау:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"Шетелде саяхаттап жүрсіз бе?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"Халықаралық төлем алынуы мүмкін"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Телефон"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"Чат"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Зерттеу кеңестері және тәсілдері"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Анықтама іздеу және пікір жіберу"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"Қолдау қызметіне хабарласыңыз"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Кіру"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"Кіре алмадыңыз ба?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"Жүйе туралы ақпаратты жіберу"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Енді көрсетпеу"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"Келесі болып сұралуда:"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"Есептік жазбаны енгізу"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"Жүйе ақпараты"</string>
+    <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+    <skip />
+    <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+    <skip />
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Жұмыс профилінің параметрлері"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Контакт іздеу"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Қоңырау шалушылар мен контактілерді анықтау үшін ұйым бойынша контакт іздеуге рұқсат беру"</string>
@@ -3599,11 +3636,12 @@
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> секунд</item>
       <item quantity="one">1 секунд</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Шамамен <xliff:g id="ESTIMATE">%1$s</xliff:g> күту керек"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Жадты басқару"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Жад кеңістігін босату үшін жад реттегіші құрылғыдағы сақтық көшірмесі жасалған фотосуреттер мен бейнелерді өшіреді."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Фотосуреттер мен бейнелерді жою"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Жад реттегіші"</string>
+    <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+    <skip />
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Aвтоматты"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Қолмен"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Орынды қазір босату"</string>
@@ -3769,8 +3807,10 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Жаңа планшеттің ішін аралаңыз"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Жаңа құрылғының ішін аралаңыз"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Бұл мүмкіндік құрылғыда жоқ"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"GNSS толық өлшемдерін қосу"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Барлық жұмыс циклінсіз GNSS тізбектері мен жиіліктерін қадағалау"</string>
+    <!-- no translation found for storage_access (8905018810338984531) -->
     <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+    <!-- no translation found for keywords_storage_access (3708874088152933579) -->
     <skip />
 </resources>
diff --git a/res/values-km/arrays.xml b/res/values-km/arrays.xml
index 5b0a171..a63e07d 100644
--- a/res/values-km/arrays.xml
+++ b/res/values-km/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"ខ្សោយ"</item>
     <item msgid="2042505933058940139">"ខ្សោយ​"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"លើសពី 60 ថ្ងៃ"</item>
     <item msgid="5692284879054004388">"លើសពី 90 ថ្ងៃ"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"ប្រើ​ចំណូលចិត្ត​បណ្តាញ"</item>
+    <item msgid="8745603368609022803">"ចាត់​ទុកថាមានការកំណត់"</item>
+    <item msgid="2266114985518865625">"​ចាត់​ទុកថាមិនមាន​ការកំណត់ទេ"</item>
+  </string-array>
 </resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 6d55ce9..53b83ff 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ឧបករណ៍របស់អ្នក"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ផ្គូផ្គង​ឧបករណ៍ថ្មី"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"អនុញ្ញាត​ឱ្យ​ឧបករណ៍​ផ្គូផ្គង និងភ្ជាប់​ទៅ​ឧបករណ៍​ប៊្លូធូស"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"បិទ​ការ​រោទ៍​ក្នុងបណ្តាញ"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"កុំ​ចាក់​សំឡេង​រោទ៍​ទូរសព្ទ​ផ្ទាល់ខ្លួន​តាម​កាស​ប៊្លូធូស"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"បាន​ភ្ជាប់​បច្ចុប្បន្ននេះ"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"ឧបករណ៍​ដែល​បាន​រក្សាទុក"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"បញ្ចូល​ឧបករណ៍"</string>
@@ -330,6 +332,16 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"កំណត់​កាល​បរិច្ឆេទ​"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"តម្រៀប​តាម​អក្សរក្រម"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"តម្រៀប​តាម​តំបន់​ពេល​វេលា"</string>
+    <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+    <skip />
+    <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+    <skip />
+    <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+    <skip />
     <string name="date_picker_title" msgid="1338210036394128512">"កាលបរិច្ឆេទ"</string>
     <string name="time_picker_title" msgid="483460752287255019">"ពេលវេលា"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"ចាក់សោ​ស្វ័យ​ប្រវត្តិ"</string>
@@ -348,6 +360,8 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"ព័ត៌មាន​ប្រវត្តិរូប"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"គណនី"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ទី​តាំង​"</string>
+    <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+    <skip />
     <string name="account_settings_title" msgid="626177544686329806">"គណនី"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"សុវត្ថិភាព និងទីតាំង"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"ការ​អ៊ិនគ្រីប និងព័ត៌មានសម្គាល់ខ្លួន"</string>
@@ -691,6 +705,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ជា​​អូប៉ាល័រ​ទូរស័ព្ទ"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"សម្រាប់​តន្ត្រី និង​មេឌៀ"</string>
     <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="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>
@@ -705,6 +721,8 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"ឈ្មោះ"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+    <skip />
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> ចង់បើក Wi-Fi"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> ចង់បិទ Wi-Fi"</string>
@@ -722,6 +740,8 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"បើក​វ៉ាយហ្វាយ"</string>
     <string name="wifi_settings" msgid="29722149822540994">"វ៉ាយហ្វាយ"</string>
+    <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+    <skip />
     <string name="wifi_settings_category" msgid="8719175790520448014">"ការកំណត់​វ៉ាយហ្វាយ"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"រៀបចំ &amp; គ្រប់គ្រង​ចំណុច​ចូល​ដំណើរការ​ឥត​ខ្សែ"</string>
@@ -833,7 +853,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (មាន WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"បញ្ចូល​ពាក្យ​សម្ងាត់​បណ្ដាញ​របស់​អ្នក"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"បណ្ដាញ Wi‑Fi នៃក្រុមហ៊ុន​បម្រើសេវាទូរសព្ទ"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"ភ្ជាប់តាមរយៈ <xliff:g id="NAME">%1%s</xliff:g>"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"ភ្ជាប់តាមរយៈ <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ដើម្បី​បង្កើន​ភាព​ត្រឹមត្រូវ​ទីតាំង និង​សម្រាប់​គោល​បំណង​ផ្សេងៗ <xliff:g id="APP_NAME">%1$s</xliff:g> ចង់​បើក​ការ​វិភាគ រក​បណ្ដាញ ទោះ​បី​ជា​បិទ វ៉ាយហ្វាយ ក៏​ដោយ។\n\nអនុញ្ញាត​សម្រាប់​កម្មវិធី​ទាំងអស់​ដែល​អ្នក​ចង់​វិភាគ​រក?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ដើម្បី​បិទ, ចូល​ទៅ​កាន់​កម្រិត​ខ្ពស់​នៅ​ក្នុង​ម៉ឺនុយ​លើស​ចំណុះ។"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"អនុញ្ញាត"</string>
@@ -909,10 +929,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"ប្រើហតស្ប៉តដើម្បីបង្កើតបណ្តាញ Wi‑Fi សម្រាប់ឧបករណ៍ផ្សេងទៀតរបស់អ្នក។ ហតស្ប៉តផ្តល់អ៊ីនធឺណិតដោយប្រើការភ្ជាប់​ទិន្នន័យ​ចល័តរបស់អ្នក។ អាចនឹងគិតប្រាក់លើទិន្នន័យទូរសព្ទចល័តបន្ថែមទៀត។"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"កម្មវិធីអាចបង្កើតហតស្ប៉ត ដើម្បីចែករំលែកមាតិកាជាមួយឧបករណ៍ដែលនៅជិត។"</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"បិទ​ហតស្ប៉ត​ដោយ​ស្វ័យប្រវត្តិ"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"ហតស៉្បត Wi-Fi នឹង​បិទ​ប្រសិនបើ​គ្មាន​ឧបករណ៍​ណា​បាន​ភ្ជាប់​ទេ"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"កំពុង​បើក​ហតស្ពត..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"កំពុង​បិទ​ហតស្ពត..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ដំណើរការ"</string>
@@ -961,6 +979,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"អាសយដ្ឋានគ្រាអាសន្ន"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"ត្រូវបានប្រើជាទីតាំងរបស់អ្នក នៅពេលដែលអ្នកហៅទូរសព្ទសង្គ្រោះបន្ទាន់តាមរយៈ Wi‑Fi"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"ស្វែង​យល់​បន្ថែម"</annotation>"អំពី​មុខងារ DNS ឯកជន"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"បង្ហាញ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"សំឡេង"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"កម្រិត​សំឡេង"</string>
@@ -1308,6 +1327,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> ថ្មីរបស់អ្នកកំពុងដំណើរការ។ \n\nដើម្បីផ្លាស់ទីទិន្នន័យកម្មវិធី រូបភាព ឯកសារទៅឧបករណ៍នេះ សូមចូលទៅកាន់ ការកំណត់ &gt; ឧបករណ៍ផ្ទុក។"</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"ផ្លាស់ទី <xliff:g id="APP">^1</xliff:g>"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"ការផ្លាស់ទី <xliff:g id="APP">^1</xliff:g> និងទិន្នន័យរបស់វាទៅ <xliff:g id="NAME_0">^2</xliff:g> នឹងចំណាយតែបន្តិចប៉ុណ្ណោះ។ អ្នកនឹងមិនអាចប្រើកម្មវិធីនេះទេ រហូតដល់ការផ្លាស់ទីនេះបញ្ចប់។ \n\nកុំដក <xliff:g id="NAME_1">^2</xliff:g> ចេញអំឡុងពេលធ្វើការផ្លាស់ទី។"</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"ដើម្បី​ផ្លាស់ទី​ទិន្នន័យ អ្នកត្រូវ​ដោះសោអ្នកប្រើប្រាស់ <xliff:g id="APP">^1</xliff:g> ។"</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"កំពុងផ្លាស់ទី <xliff:g id="APP">^1</xliff:g>…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"កុំដក <xliff:g id="NAME">^1</xliff:g> ចេញអំឡុងពេលធ្វើការផ្លាស់ទី។ \n\nកម្មវិធី <xliff:g id="APP">^2</xliff:g> នៅលើឧបករណ៍នេះនឹងមិនមានទេ រហូតដល់ការផ្លាស់ទីបញ្ចប់។"</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"បោះបង់ការផ្លាស់ទី"</string>
@@ -1468,6 +1488,8 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"ប្រភព​ទីតាំង"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"អំពី​កុំព្យូទ័រ​បន្ទះ"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"អំពី​ទូរសព្ទ"</string>
+    <!-- no translation found for about_settings (6717640957897546887) -->
+    <skip />
     <string name="about_settings" product="emulator" msgid="221313099578564438">"អំពីឧបករណ៍ត្រាប់តាម"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"មើល​ព័ត៌មាន​ផ្លូវច្បាប់, ស្ថានភាព, កំណែ​កម្មវិធី"</string>
     <string name="legal_information" msgid="5769301644270604095">"ព័ត៌មាន​ផ្លូវ​ច្បាប់"</string>
@@ -1575,6 +1597,8 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"មើលកម្មវិធី​ទាំង <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"ថេប្លេត និងទិន្នន័យផ្ទាល់ខ្លួនរបស់អ្នកងាយនឹងរងគ្រោះពីការវាយប្រហារពីកម្មវិធីដែលមិនស្គាល់។ ប្រសិនបើដំឡើងកម្មវិធីពីប្រភពនេះ មានន័យថាអ្នកទទួលខុសត្រូវលើការខូចខាតណាមួយចំពោះទូរសព្ទ ឬការបាត់បង់ទិន្នន័យ ដែលអាចបណ្តាលមកពីការប្រើប្រាស់កម្មវិធីទាំងនោះ។"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"ទូរសព្ទ និងទិន្នន័យផ្ទាល់ខ្លួនរបស់អ្នកងាយនឹងរងគ្រោះពីការវាយប្រហារពីកម្មវិធីដែលមិនស្គាល់។ ប្រសិនបើដំឡើងកម្មវិធីពីប្រភពនេះ មានន័យថាអ្នកនឹងទទួលខុសត្រូវលើការខូចខាតណាមួយចំពោះទូរសព្ទ ឬការបាត់បង់ទិន្នន័យរបស់អ្នក ដែលអាចបណ្តាលមកពីការប្រើប្រាស់កម្មវិធីទាំងនោះ។"</string>
+    <!-- no translation found for install_all_warning (3648003301476423145) -->
+    <skip />
     <string name="advanced_settings" msgid="1777249286757067969">"ការ​កំណត់​កម្រិត​ខ្ពស់"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"បើក​ជម្រើស​កំណត់​ច្រើន​ទៀត"</string>
     <string name="application_info_label" msgid="5736524913065714880">"ព័ត៌មាន​កម្មវិធី"</string>
@@ -1874,6 +1898,12 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"អាចប៉ះពាល់ដល់ប្រតិបត្តិការ"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"ចុចបន្ទាប់ពីទ្រនិចឈប់ផ្លាស់ទី"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ពន្យារពេលមុនពេលចុច"</string>
+    <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+    <skip />
+    <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+    <skip />
+    <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+    <skip />
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"បើក"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"បិទ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"បង្ហាញ​នៅ​ក្នុង​ការ​កំណត់​​រហ័ស"</string>
@@ -2030,14 +2060,37 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"កំពុងដាស់ឧបករណ៍​នៅ​ផ្ទៃខាងក្រោយ"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"កំពុង​ស្នើ​ទីកន្លែង​ច្រើនដងហើយ"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"កម្មវិធី <xliff:g id="NUMBER">%1$d</xliff:g> កំពុងដំណើរការខុសធម្មតា"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"ថ្ម​នៅ​ដំណើរការ​ល្អ"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"កម្មវិធី​កំពុង​ដំណើរការ​ជាធម្មតា"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"កម្លាំងថ្មខ្សោយ"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"ថ្ម​មិន​អាច​ផ្តល់​កម្រិត​ថាមពល​ថ្ម​ខ្លាំងទេ"</string>
+    <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+    <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"ទូរសព្ទត្រូវបាន​ប្រើច្រើន"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"ថេប្លេតត្រូវបាន​ប្រើច្រើន"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"ឧបករណ៍ត្រូវបាន​ប្រើច្រើន"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"ប្រហែល <xliff:g id="HOUR">%1$s</xliff:g> ចាប់តាំងពី​សាកថ្មពេញ​លើកចុងក្រោយ"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"ទូរសព្ទរបស់អ្នក​ត្រូវបាន​ប្រើច្រើន​ ដូច្នេះវា​ប្រើប្រាស់ថ្មច្រើន​។ ថ្មរបស់អ្នក​កំពុងដំណើរការ​ធម្មតា។\n\nទូរសព្ទរបស់អ្នក​ត្រូវបាន​ប្រើអស់រយៈ​ពេលប្រហែល <xliff:g id="HOUR">%1$s</xliff:g> ចាប់តាំងពី​សាកថ្មពេញ​លើកចុងក្រោយ។\n\n ការប្រើប្រាស់​ថ្មសរុប៖"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"ថេប្លេតរបស់អ្នក​ត្រូវបាន​ប្រើច្រើន​ ដូច្នេះវាបាន​ប្រើប្រាស់ថ្មច្រើន​។ ថ្មរបស់អ្នក​កំពុងដំណើរការ​ធម្មតា។\n\nថេប្លេតរបស់អ្នក​ត្រូវបាន​ប្រើអស់រយៈ​ពេលប្រហែល <xliff:g id="HOUR">%1$s</xliff:g> ចាប់តាំងពី​សាកថ្មពេញ​លើកចុងក្រោយ។\n\n ការប្រើប្រាស់​ថ្មសរុប៖"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"ឧបករណ៍របស់អ្នក​ត្រូវបាន​ប្រើច្រើន​ ដូច្នេះវា​ប្រើប្រាស់ថ្មច្រើន​។ ថ្មរបស់អ្នក​កំពុងដំណើរការ​ធម្មតា។\n\n ឧបករណ៍របស់អ្នក​ត្រូវបានប្រើ​អស់រយៈពេល​ប្រហែល <xliff:g id="HOUR">%1$s</xliff:g> ចាប់តាំងពី​សាកថ្មពេញ​លើកចុងក្រោយ​។\n\n ការប្រើប្រាស់​ថ្មសរុប៖"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"កម្មវិធី​គ្រប់គ្រង​ថ្ម​ឆ្លាតវៃ"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"​គ្រប់គ្រងថ្ម​​ដោយ​ស្វ័យប្រវត្តិ"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"កែសម្រួលការប្រើប្រាស់​ថាមពល​​ដោយកម្មវិធីដោយស្វ័យប្រវត្តិ ​ផ្អែកលើ​ការប្រើប្រាស់"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"កម្មវិធី​ដែល​បាន​រឹតបន្តឹង"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="other">កម្មវិធី %1$d</item>
+      <item quantity="one">កម្មវិធី %1$d</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"បញ្ឈប់កម្មវិធី?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"ទូរសព្ទ​របស់អ្នក​មិនអាច​គ្រប់គ្រង​ថ្ម​បានដូចធម្មតានោះទេ ដោយសារ <xliff:g id="APP">%1$s</xliff:g> កំពុង​បន្ត​ធ្វើឲ្យទូរសព្ទ​របស់អ្នក​ភ្ញាក់។\n\nដើម្បី​ព្យាយាម​ដោះស្រាយបញ្ហានេះ អ្នក​អាច​បញ្ឈប់​កម្មវិធី​នេះ​។\n\nប្រសិនបើ​បញ្ហា​នេះ​នៅតែបន្ត​កើត​ឡើង អ្នក​គួរ​តែលុប​កម្មវិធីនេះ ដើម្បី​ធ្វើ​ឲ្យ​ដំណើរការថ្ម​មានភាពប្រសើរឡើង។"</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"ថេប្លេត​របស់អ្នក​មិនអាច​គ្រប់គ្រង​ថ្ម​បានដូចធម្មតានោះទេ ដោយសារ <xliff:g id="APP">%1$s</xliff:g> កំពុង​បន្ត​ធ្វើឲ្យថេប្លេត​របស់អ្នក​ភ្ញាក់។\n\nដើម្បី​ព្យាយាម​ដោះស្រាយបញ្ហានេះ អ្នក​អាច​បញ្ឈប់​កម្មវិធី​នេះ​។\n\nប្រសិនបើ​បញ្ហា​នេះ​នៅតែបន្ត​កើត​ឡើង អ្នក​គួរ​តែលុប​កម្មវិធីនេះ ដើម្បី​ធ្វើ​ឲ្យ​ដំណើរការថ្ម​មានភាពប្រសើរឡើង។"</string>
@@ -2146,6 +2199,8 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"បង្កើនប្រសិទ្ធិភាពកម្មវិធី"</string>
     <string name="battery_saver" msgid="8172485772238572153">"កម្មវិធីសន្សំថ្ម"</string>
+    <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+    <skip />
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"បើក​ដោយ​ស្វ័យ​ប្រវត្តិ"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"កុំ"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"នៅពេលដែលថ្មសល់ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2366,6 +2421,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"លុប​គណនី?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"លុប​គណនី​នេះ នឹង​លុប​សារ,​ ទំនាក់ទំនង និង​ទិន្នន័យ​ផ្សេងៗ​ទៀត​ទាំងអស់​ពី​កុំព្យូទ័រ​បន្ទះ​របស់​អ្នក!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"ការ​លុប​គណនី​នេះ​នឹង​លុប​សារ ទំនាក់ទំនង និង​ទិន្នន័យ​ផ្សេងៗ​របស់​គណនីនេះទាំងអស់​ពី​ទូរស័ព្ទ!"</string>
+    <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+    <skip />
     <string name="remove_account_failed" msgid="3901397272647112455">"ការផ្លាស់ប្តូរនេះ​មិនត្រូវ​បាន​អនុញ្ញាត​ដោយអ្នកគ្រប់គ្រងរបស់អ្នក"</string>
     <string name="provider_label" msgid="7724593781904508866">"ការ​ជាវ​ជា​ក្រុម"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2890,8 +2947,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"រារាំងការរំខានក្នុងការមើល"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"អនុញ្ញាត​សញ្ញា​ដែលមើល​ឃើញ"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"បញ្ចូល"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"បើក​ឥឡូវនេះ"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"បិទឥឡូវនេះ"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"បើក​ឥឡូវនេះ"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"បិទឥឡូវនេះ"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"មុខងារ​កុំ​រំខាន​បើក​រហូត​ដល់​ម៉ោង <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"មុខងារ​កុំ​រំខាន​នឹង​នៅ​បន្ត​បើក​រហូត​ទាល់​តែ​អ្នក​បិទ​វា"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"មុខងារ​កុំ​រំខាន​ត្រូវបាន​បើកតាមរយៈ​ច្បាប់ (<xliff:g id="RULE_NAME">%s</xliff:g>) ដោយ​ស្វ័យប្រវត្តិ"</string>
@@ -2930,7 +2987,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"ការ​ជូន​ដំណឹង​កម្មវិធី"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"ប្រភេទ​នៃ​ការជូនដំណឹង"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"ក្រុមប្រភេទ​នៃការជូនដំណឹង"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"សារៈសំខាន់"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"សកម្មភាព"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"អនុញ្ញាត​ឱ្យមាន​សំឡេង"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"កុំ​បង្ហាញ​ការ​ជូនដំណឹង"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"គ្មាន​សំឡេង ឬ​ការ​រំខាន​ដល់​ការ​មើល​ឡើយ"</string>
@@ -2948,6 +3005,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"សំខាន់កម្រិតមធ្យម"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"សំខាន់ខ្លាំង"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"សំខាន់ជាបន្ទាន់"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"បង្ហាញ​ការ​ជូន​ដំណឹង"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"ជំនួយការជូនដំណឹង"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"ចូល​ដំណើរការ​ការ​ជូន​ដំណឹង"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"ការ​ចូលប្រើប្រាស់​កម្រង​ព័ត៌មាន​ការងារ​ត្រូវ​បានទប់ស្កាត់"</string>
@@ -2978,9 +3036,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"ចូលដំណើរការមុខងារកុំរំខាន"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"គ្មានកម្មវិធីបានដំឡើងណាមួយបានស្នើការចូលដំណើរការមុខងារកុំរំខានទេ"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"កំពុង​ផ្ទុក​កម្មវិធី..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"ប្រព័ន្ធប្រតិបត្តិការ Android កំពុងទប់ស្កាត់ការជូនដំណឹងរបស់កម្មវិធីនេះមិនឲ្យបង្ហាញនៅលើឧបករណ៍នេះទេ"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"ប្រព័ន្ធប្រតិបត្តិការ Android កំពុងទប់ស្កាត់ប្រភេទនៃការជូនដំណឹងនេះមិនឲ្យបង្ហាញនៅលើឧបករណ៍នេះទេ"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android កំពុងទប់ស្កាត់​ក្រុមការជូនដំណឹងនេះ​មិនឱ្យបង្ហាញនៅលើ​ឧបករណ៍នេះទេ"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"តាមសំណើ​របស់អ្នក ប្រព័ន្ធ​ប្រតិបត្តិការ Android កំពុង​ទប់ស្កាត់​ការជូនដំណឹង​របស់កម្មវិធី​នេះ​មិន​ឱ្យ​បង្ហាញ​នៅលើ​ឧបករណ៍​នេះទេ"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"តាមសំណើ​របស់អ្នក ប្រព័ន្ធ​ប្រតិបត្តិការ Android កំពុង​ទប់ស្កាត់​ប្រភេទនៃការជូនដំណឹង​​នេះ​មិន​ឱ្យ​បង្ហាញ​នៅលើ​ឧបករណ៍​នេះទេ"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"តាមសំណើ​របស់អ្នក ប្រព័ន្ធ​ប្រតិបត្តិការ Android កំពុង​ទប់ស្កាត់​ក្រុមនៃ​ការជូនដំណឹង​នេះ​មិន​ឱ្យ​បង្ហាញ​នៅលើ​ឧបករណ៍​នេះទេ"</string>
     <string name="notification_channels" msgid="5346841743182627500">"ប្រភេទ"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"ផ្សេងៗ"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3559,31 +3617,10 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"បានភ្ជាប់​ទៅ​ឧបករណ៍​ច្រើន"</string>
     <string name="demo_mode" msgid="2798762752209330277">"មុខងារ​សាកល្បង​ UI ​ប្រព័ន្ធ"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"ប្រអប់​ការ​កំណត់​រហ័ស​សម្រាប់​អ្នកអភិវឌ្ឍន៍"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"យើងនៅទីនេះដើម្បីផ្តល់ជំនួយ"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"យើងនៅទីនេះ 24/7"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"យើងផ្តល់ជូនសេវាកម្មសម្រាប់អ្នក 24 ម៉ោង"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"ក្រុមការងារផ្នែកគាំទ្ររបស់យើងនៅទីនេះដើម្បីជួយដោះស្រាយបញ្ហាណាមួយ"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"ក្រុមការងារផ្នែកគាំទ្ររបស់យើងនៅទីនេះគ្រប់ពេល ជារៀងរាល់ថ្ងៃ។"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"សូមស្វែងរកជំនួយ ឬត្រឡប់មកវិញក្នុងម៉ោងផ្តល់ជូនការគាំទ្រ (ម៉ោងក្នុងស្រុក):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"ម៉ោងផ្តល់ជូនការគាំទ្រតាមទូរស័ព្ទ (ម៉ោងក្នុងស្រុក)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"ស្វែងរកជំនួយ ឬរុករកគន្លឹះ និងល្បិចប្រើ"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"គាំទ្រ៖"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"គ្រោងធ្វើដំណើរក្រៅប្រទេសមែនទេ?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"ការគិតប្រាក់កម្រិតអន្តរជាតិអាចនឹងត្រូវអនុវត្ត"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"ទូរសព្ទ"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"ជជែក"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"រុករកគន្លឹះ និងល្បិច"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"ស្វែងរកជំនួយ និងផ្ញើមតិ"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"ទាក់ទងផ្នែកគាំទ្រ"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"ចូល"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"មិនអាចចូលគណនីបានឬ?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"ផ្ញើព័ត៌មានប្រព័ន្ធ"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"កុំបង្ហាញម្តងទៀត"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"ស្នើ​សុំ​ជា​"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"បញ្ចូលគណនី"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"ព័ត៌មាន​អំពី​ប្រព័ន្ធ"</string>
+    <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+    <skip />
+    <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+    <skip />
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"ការកំណត់ប្រវត្តិរូបការងារ"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"ការស្វែងរកទំនាក់ទំនង"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"អនុញ្ញាតការស្វែងរកទំនាក់ទំនងដោយស្ថាប័នរបស់អ្នកដើម្បីកំណត់អត្តសញ្ញាណអ្នកហៅ និងលេខទំនាក់ទំនង"</string>
@@ -3599,11 +3636,12 @@
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> វិនាទី</item>
       <item quantity="one">1 វិនាទី</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> រង់ចាំ"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"គ្រប់គ្រងទំហំផ្ទុក"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"ដើម្បីបង្កើនទំហំផ្ទុក កម្មវិធីគ្រប់គ្រងទំហំផ្ទុកយករូបថត និងវីដេអូដែលបានបម្រុងទុកចេញពីឧបករណ៍របស់អ្នក។"</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"យករូបថត និងវីដេអូចេញ"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"កម្មវិធីគ្រប់គ្រងទំហំផ្ទុក"</string>
+    <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+    <skip />
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"ស្វ័យប្រវត្តិ"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"ឯកសារណែនាំ"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"បង្កើនទំហំផ្ទុកឥឡូវនេះ"</string>
@@ -3769,8 +3807,10 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"មើលការណែនាំ​ថេប្លេតថ្មីរបស់អ្នក"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"មើលការណែនាំ​ឧបករណ៍ថ្មី​របស់អ្នក"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"មុខងារនេះ​មិនមាន​នៅលើ​ឧបករណ៍​នេះទេ"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"ជំរុញការវាស់ GNSS ពេញលេញ"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"តាមដានក្រុមរូបថត និងហ្រេ្វកង់ GNSS ទាំងអស់​ដែល​គ្មាន​ការបែង​ចែក​រយៈពេល​ដំណើរការ"</string>
+    <!-- no translation found for storage_access (8905018810338984531) -->
     <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+    <!-- no translation found for keywords_storage_access (3708874088152933579) -->
     <skip />
 </resources>
diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml
index bc7967f..43a6150 100644
--- a/res/values-kn/arrays.xml
+++ b/res/values-kn/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"ಕಳಪೆ"</item>
     <item msgid="2042505933058940139">"ಕಳಪೆ"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"60 ದಿನಗಳಿಗಿಂತಲೂ ಹಳೆಯದು"</item>
     <item msgid="5692284879054004388">"90 ದಿನಗಳಿಗಿಂತಲೂ ಹಳೆಯದು"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"ನೆಟ್‌ವರ್ಕ್ ಆದ್ಯತೆಯನ್ನು ಬಳಸಿ"</item>
+    <item msgid="8745603368609022803">"ಮೀಟರ್ ಮಾಡಿದೆ ಎಂದು ಪರಿಗಣಿಸಿ"</item>
+    <item msgid="2266114985518865625">"ಮೀಟರ್ ಮಾಡಲಾಗಿಲ್ಲ ಎಂದು ಪರಿಗಣಿಸಿ"</item>
+  </string-array>
 </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 231aa8b..99721c3 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ನಿಮ್ಮ ಸಾಧನಗಳು"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ಹೊಸ ಸಾಧನವನ್ನು ಜೋಡಿಸಿ"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"ಸಾಧನವನ್ನು ಜೋಡಿಸಲು ಮತ್ತು ಬ್ಲ್ಯೂಟೂತ್ ಸಾಧನಗಳಿಗೆ ಸಂಪರ್ಕಿಸಲು ಅನುಮತಿಸಿ"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"ಇನ್ ಬ್ಯಾಂಡ್ ರಿಂಗಿಂಗ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"ಬ್ಲೂಟೂತ್ ಹೆಡ್‌ಸೆಟ್‌ಗಳಲ್ಲಿ ಕಸ್ಟಮ್ ಫೋನ್ ರಿಂಗ್ ಟೋನ್‌ಗಳನ್ನು ಪ್ಲೇ ಮಾಡಬೇಡಿ"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"ಪ್ರಸ್ತುತ ಸಂಪರ್ಕಿಸಲಾಗಿದೆ"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"ಉಳಿಸಿರುವ ಸಾಧನಗಳು"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"ಸಾಧನ ಸೇರಿಸಿ"</string>
@@ -330,6 +332,16 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"ದಿನಾಂಕವನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"ವರ್ಣಮಾಲೆಯಾನುಸಾರ ವಿಂಗಡಿಸು"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"ಸಮಯ ವಲಯದ ಅನುಸಾರ ವಿಂಗಡಿಸು"</string>
+    <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+    <skip />
+    <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+    <skip />
+    <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+    <skip />
     <string name="date_picker_title" msgid="1338210036394128512">"ದಿನಾಂಕ"</string>
     <string name="time_picker_title" msgid="483460752287255019">"ಸಮಯ"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಲಾಕ್ ಮಾಡು"</string>
@@ -348,6 +360,8 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"ಪ್ರೊಫೈಲ್‌‌ ಮಾಹಿತಿ"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ಖಾತೆಗಳು"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ಸ್ಥಳ"</string>
+    <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+    <skip />
     <string name="account_settings_title" msgid="626177544686329806">"ಖಾತೆಗಳು"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"ಭದ್ರತೆ ಮತ್ತು ಸ್ಥಳ"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"ಎನ್‌ಕ್ರಿಪ್ಶನ್ ಮತ್ತು ರುಜುವಾತುಗಳು"</string>
@@ -691,6 +705,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ಸ್ಪೀಕರ್ ಫೋನ್‌ನಂತೆ"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"ಸಂಗೀತ ಮತ್ತು ಮಾಧ್ಯಮಕ್ಕಾಗಿ"</string>
     <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="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>
@@ -705,6 +721,8 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"ಹೆಸರು"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+    <skip />
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"ವೈ-ಫೈ ಆನ್ ಮಾಡಲು <xliff:g id="REQUESTER">%s</xliff:g> ಬಯಸುತ್ತದೆ"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"ವೈ-ಫೈ ಆಫ್ ಮಾಡಲು <xliff:g id="REQUESTER">%s</xliff:g> ಬಯಸುತ್ತದೆ"</string>
@@ -722,6 +740,8 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi‑Fi ಆನ್‌ ಮಾಡಿ"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+    <skip />
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"ವಯರ್‌ಲೆಸ್‌ ಪ್ರವೇಶಿಸುವಿಕೆ ಅಂಶಗಳನ್ನು ಹೊಂದಿಸಿ &amp; ನಿರ್ವಹಿಸಿ"</string>
@@ -833,7 +853,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ಲಭ್ಯವಿದೆ)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ನಿಮ್ಮ ನೆಟ್‌ವರ್ಕ್‌ ಪಾಸ್‌ವರ್ಡ್‌ ನಮೂದಿಸಿ"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ ವಾಹಕ"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> ಮೂಲಕ ಸಂಪರ್ಕಿಸಿ"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> ಮೂಲಕ ಸಂಪರ್ಕಿಸಿ"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ಸ್ಥಳ ನಿಖರತೆಯನ್ನು ಸುಧಾರಿಸಲು ಮತ್ತು ಇತರ ಉದ್ದೇಶಗಳಿಗಾಗಿ, ವೈ-ಫೈ ಆಫ್‌ ಇದ್ದಾಗಲೂ ಸಹ <xliff:g id="APP_NAME">%1$s</xliff:g> ನೆಟ್‌ವರ್ಕ್‌ ಸ್ಕ್ಯಾನಿಂಗ್‌ ಆನ್‌ ಮಾಡಲು ಬಯಸುತ್ತದೆ.\n\nಸ್ಕ್ಯಾನ್ ಮಾಡಲು ಬಯಸುವ ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಇದಕ್ಕೆ ಅನುಮತಿಸುವುದೇ?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ಇದನ್ನು ಆಫ್ ಮಾಡಲು, ಓವರ್‌ಫ್ಲೋ ಮೆನುವಿನಲ್ಲಿನ ಸುಧಾರಿತ ಗೆ ಹೋಗಿ."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ಅನುಮತಿಸಿ"</string>
@@ -909,10 +929,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP ಬ್ಯಾಂಡ್"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"ನಿಮ್ಮ ಇತರ ಸಾಧನಗಳಿಗೆ ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ ರಚಿಸಲು ಹಾಟ್‌ಸ್ಪಾಟ್‌ ಬಳಸಿ. ನಿಮ್ಮ ಮೊಬೈಲ್‌ ಡೇಟಾ ಸಂಪರ್ಕವನ್ನು ಬಳಸಿಕೊಂಡು ಹಾಟ್‌ಸ್ಪಾಟ್‌ ಇಂಟರ್ನೆಟ್‌ ಅನ್ನು ಒದಗಿಸುತ್ತದೆ. ಹೆಚ್ಚುವರಿ ಮೊಬೈಲ್‌ ಡೇಟಾ ಶುಲ್ಕಗಳು ಅನ್ವಯವಾಗಬಹುದು."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ಹತ್ತಿರದ ಸಾಧನಗಳೊಂದಿಗೆ ವಿಷಯವನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಹಾಟ್‌ಸ್ಪಾಟ್ ಅನ್ನು ಸಹ ರಚಿಸಬಹುದು."</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಹಾಟ್‌ಸ್ಪಾಟ್ ಆಫ್ ಮಾಡಿ"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"ಯಾವುದೇ ಸಾಧನಗಳು ಸಂಪರ್ಕಗೊಂಡಿಲ್ಲದಿದ್ದಾಗ ವೈ-ಫೈ ಹಾಟ್‌ಸ್ಪಾಟ್ ಆಫ್ ಆಗುತ್ತದೆ"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"ಹಾಟ್‌ಸ್ಪಾಟ್ ಆನ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"ಹಾಟ್‌ಸ್ಪಾಟ್ ಆಫ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ಸಕ್ರಿಯವಾಗಿದೆ"</string>
@@ -961,6 +979,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"ತುರ್ತು ವಿಳಾಸ"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"ವೈ-ಫೈ ಮೂಲಕ ತುರ್ತು ಕರೆಯನ್ನು ನೀವು ಮಾಡಿದಾಗ ನಿಮ್ಮ ಸ್ಥಳದಂತೆ ಬಳಸಲಾಗುತ್ತದೆ"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958">"ಖಾಸಗಿ DNS ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಕುರಿತು "<annotation id="url">"ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</annotation></string>
     <string name="display_settings_title" msgid="1708697328627382561">"ಪ್ರದರ್ಶನ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ಧ್ವನಿ"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ವಾಲ್ಯುಮ್‌ಗಳು"</string>
@@ -1308,6 +1327,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"ನಿಮ್ಮ ಹೊಸ <xliff:g id="NAME">^1</xliff:g> ಕೆಲಸ ಮಾಡುತ್ತಿದೆ. \n\nಈ ಸಾಧನಕ್ಕೆ ಫೋಟೋಗಳು, ಫೈಲ್‌ಗಳು ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾವನ್ನು ಸರಿಸಲು, ಸೆಟ್ಟಿಂಗ್‌ಗಳು &gt; ಸಂಗ್ರಹಣೆಗೆ ಹೋಗಿ."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> ಅನ್ನು ಸರಿಸಿ"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> ಮತ್ತು ಅದರ ಡೇಟಾವನ್ನು <xliff:g id="NAME_0">^2</xliff:g> ಗೆ ಸರಿಸಲು ಕೆಲವು ಕ್ಷಣಗಳನ್ನು ತೆಗೆದುಕೊಳ್ಳಬಹುದು. ಸರಿಸುವುದು ಪೂರ್ಣಗೊಳ್ಳುವವರೆಗೆ ನಿಮಗೆ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಸರಿಸುವಾಗ <xliff:g id="NAME_1">^2</xliff:g> ಅನ್ನು ತೆಗೆದುಹಾಕಬೇಡಿ."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"ಡೇಟಾವನ್ನು ಸರಿಸಲು ನೀವು ಬಳಕೆದಾರರ <xliff:g id="APP">^1</xliff:g> ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಬೇಕಾಗಿದೆ."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> ಅನ್ನು ಸರಿಸಲಾಗುತ್ತಿದೆ…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"ಸರಿಸುವಾಗ <xliff:g id="NAME">^1</xliff:g> ಅನ್ನು ತೆಗೆದುಹಾಕಬೇಡಿ. \n\nಈ ಸಾಧನದಲ್ಲಿರುವ <xliff:g id="APP">^2</xliff:g> ಅಪ್ಲಿಕೇಶನ್ ಸರಿಸುವುದು ಪೂರ್ಣಗೊಳ್ಳುವವರೆಗೆ ಲಭ್ಯವಿರುವುದಿಲ್ಲ."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ಸರಿಸುವುದನ್ನು ರದ್ದುಮಾಡಿ"</string>
@@ -1468,6 +1488,8 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"ಸ್ಥಳ ಮೂಲಗಳು"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"ಟ್ಯಾಬ್ಲೆಟ್ ಕುರಿತು"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"ಫೋನ್ ಕುರಿತು"</string>
+    <!-- no translation found for about_settings (6717640957897546887) -->
+    <skip />
     <string name="about_settings" product="emulator" msgid="221313099578564438">"ಅನುಸರಿಸುವ ಸಾಧನದ ಕುರಿತು"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"ಕಾನೂನು ಮಾಹಿತಿ, ಸ್ಥಿತಿ, ಸಾಫ್ಟ್‌ವೇರ್ ಆವೃತ್ತಿಯನ್ನು ವೀಕ್ಷಿಸಿ"</string>
     <string name="legal_information" msgid="5769301644270604095">"ಕಾನೂನು ಮಾಹಿತಿ"</string>
@@ -1575,6 +1597,8 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"ಎಲ್ಲಾ <xliff:g id="COUNT">%1$d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಹಾಗೂ ವೈಯಕ್ತಿಕ ಡೇಟಾ, ಅಪರಿಚಿತ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ದಾಳಿಗೆ ತುತ್ತಾಗುವ ಸಾಧ್ಯತೆ ಹೆಚ್ಚಾಗಿದೆ. ಈ ಮೂಲದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಸ್ಥಾಪಿಸುವ ಮೂಲಕ, ನಿಮ್ಮ ಫೋನ್‌ಗೆ ಯಾವುದೇ ಹಾನಿ ಉಂಟಾದರೆ ಅಥವಾ ಅವುಗಳ ಬಳಕೆಯಿಂದ ಡೇಟಾ ನಷ್ಟವಾದರೆ, ಅದಕ್ಕೆ ನೀವೇ ಜವಾಬ್ದಾರರು ಎನ್ನುವುದನ್ನು ಒಪ್ಪಿಕೊಳ್ಳುತ್ತೀರಿ."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"ನಿಮ್ಮ ಫೋನ್ ಹಾಗೂ ವೈಯಕ್ತಿಕ ಡೇಟಾ, ಅಪರಿಚಿತ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ದಾಳಿಗೆ ತುತ್ತಾಗುವ ಸಾಧ್ಯತೆ ಹೆಚ್ಚಾಗಿದೆ. ಈ ಮೂಲದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಸ್ಥಾಪಿಸುವ ಮೂಲಕ, ನಿಮ್ಮ ಫೋನ್‌ಗೆ ಯಾವುದೇ ಹಾನಿ ಉಂಟಾದರೆ ಅಥವಾ ಅವುಗಳ ಬಳಕೆಯಿಂದ ಡೇಟಾ ನಷ್ಟವಾದರೆ, ಅದಕ್ಕೆ ನೀವೇ ಜವಾಬ್ದಾರರು ಎನ್ನುವುದನ್ನು ಒಪ್ಪಿಕೊಳ್ಳುತ್ತೀರಿ."</string>
+    <!-- no translation found for install_all_warning (3648003301476423145) -->
+    <skip />
     <string name="advanced_settings" msgid="1777249286757067969">"ಸುಧಾರಿತ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"ಇನ್ನಷ್ಟು ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಆಯ್ಕೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸು"</string>
     <string name="application_info_label" msgid="5736524913065714880">"ಅಪ್ಲಿಕೇಶನ್ ಮಾಹಿತಿ"</string>
@@ -1874,6 +1898,12 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"ಕಾರ್ಯಕ್ಷಮತೆಯ ಮೇಲೆ ಪರಿಣಾಮ ಬೀರಬಹುದು"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"ಪಾಯಿಂಟರ್ ನಿಂತ ಬಳಿಕ ಕ್ಲಿಕ್"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ಕ್ಲಿಕ್ ಮಾಡುವ ಮೊದಲು ವಿಳಂಬ"</string>
+    <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+    <skip />
+    <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+    <skip />
+    <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+    <skip />
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ಆನ್"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ಆಫ್"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"ತ್ವರಿತ ಸೆಟ್ಟಿಂಗ್‌‌ಗಳಲ್ಲಿ ತೋರಿಸು"</string>
@@ -2030,14 +2060,37 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ಸಾಧನವನ್ನು ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿದೆ"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"ಆಗಾಗ್ಗೆ ಸ್ಥಳವನ್ನು ವಿನಂತಿಸಲಾಗುತ್ತಿದೆ"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"ಅನುಚಿತವಾಗಿ ವರ್ತಿಸುತ್ತಿರುವ <xliff:g id="NUMBER">%1$d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"ಬ್ಯಾಟರಿ ಉತ್ತಮ ಆಕಾರದಲ್ಲಿದೆ"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಸಾಮಾನ್ಯವಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತವೆ"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"ಕಡಿಮೆ ಬ್ಯಾಟರಿ ಸಾಮರ್ಥ್ಯ"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"ಬ್ಯಾಟರಿ ಉತ್ತಮ ಬ್ಯಾಟರಿ ಬಾಳಿಕೆ ಒದಗಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+    <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+    <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"ಫೋನ್ ಅನ್ನು ಹೆಚ್ಚಾಗಿ ಬಳಸಲಾಗಿದೆ"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಹೆಚ್ಚಾಗಿ ಬಳಸಲಾಗಿದೆ"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"ಸಾಧನವನ್ನು ಹೆಚ್ಚಾಗಿ ಬಳಸಲಾಗಿದೆ"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"ಕೊನೆಯ ಪೂರ್ಣ ಚಾರ್ಜ್‌ನಿಂದ <xliff:g id="HOUR">%1$s</xliff:g> ಗಳಷ್ಟು ಬಳಕೆ"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಹೆಚ್ಚಾಗಿ ಬಳಸಲಾಗಿದೆ ಮತ್ತು ಇದು ತುಂಬ ಬ್ಯಾಟರಿಯನ್ನು ಬಳಸಿಕೊಂಡಿದೆ. ನಿಮ್ಮ ಬ್ಯಾಟರಿ ಸಾಮಾನ್ಯವಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತಿದೆ.\n\n ಕೊನೆಯ ಪೂರ್ಣ ಚಾರ್ಜ್‌ನಿಂದ <xliff:g id="HOUR">%1$s</xliff:g> ಗಳಷ್ಟು ನಿಮ್ಮ ಫೋನ್ ಬಳಕೆಮಾಡಿಕೊಂಡಿದೆ. \n\n ಒಟ್ಟು ಬಳಕೆ:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌‌ ಅನ್ನು ಹೆಚ್ಚಾಗಿ ಬಳಸಲಾಗಿದೆ ಮತ್ತು ಇದು ತುಂಬ ಬ್ಯಾಟರಿಯನ್ನು ಬಳಸಿಕೊಂಡಿದೆ. ನಿಮ್ಮ ಬ್ಯಾಟರಿ ಸಾಮಾನ್ಯವಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತಿದೆ. \n\n ಕೊನೆಯ ಪೂರ್ಣ ಚಾರ್ಜ್‌ನಿಂದ <xliff:g id="HOUR">%1$s</xliff:g> ಗಳಷ್ಟು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಬಳಕೆಮಾಡಿಕೊಂಡಿದೆ. \n\n ಒಟ್ಟು ಬಳಕೆ:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್ನು ಹೆಚ್ಚಾಗಿ ಬಳಸಲಾಗಿದೆ ಮತ್ತು ಇದು ತುಂಬ ಬ್ಯಾಟರಿಯನ್ನು ಬಳಸಿಕೊಂಡಿದೆ. ನಿಮ್ಮ ಬ್ಯಾಟರಿ ಸಾಮಾನ್ಯವಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತಿದೆ. \n\n ಕೊನೆಯ ಪೂರ್ಣ ಚಾರ್ಜ್‌ನಿಂದ <xliff:g id="HOUR">%1$s</xliff:g> ಗಳಷ್ಟು ನಿಮ್ಮ ಸಾಧನ ಬಳಕೆಮಾಡಿಕೊಂಡಿದೆ.\n\n ಒಟ್ಟು ಬಳಕೆ:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"ಸ್ಮಾರ್ಟ್ ಬ್ಯಾಟರಿ ನಿರ್ವಾಹಕರು"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"ಸ್ವಯಂ-ನಿರ್ವಾಹಕ ಬ್ಯಾಟರಿ"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"ಬಳಕೆಯನ್ನು ಆಧರಿಸಿಕೊಂಡು ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಮೂಲಕ ಪವರ್ ಬಳಕೆಯನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸರಿಹೊಂದಿಸಿ"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"ನಿರ್ಬಂಧಿತ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="one">%1$d ಅಪ್ಲಿಕೇಶನ್‌ಗಳು</item>
+      <item quantity="other">%1$d ಅಪ್ಲಿಕೇಶನ್‌ಗಳು</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"ಅಪ್ಲಿಕೇಶನ್‌ ನಿಲ್ಲಿಸಬೇಕೇ?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"<xliff:g id="APP">%1$s</xliff:g>ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಫೋನ್ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಸರಿಪಡಿಸಲು, ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ನಿಲ್ಲಿಸಬಹುದು.\n\nಇದನ್ನು ಮುಂದುವರಿಸಿದ್ದಲ್ಲಿ, ಬ್ಯಾಟರಿ ಕಾರ್ಯಕ್ಷಮತೆ ಸುಧಾರಿಸಲು ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅಸ್ಥಾಪಿಸಬೇಕಾಗುತ್ತದೆ."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"<xliff:g id="APP">%1$s</xliff:g>ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ ಅನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಸರಿಪಡಿಸಲು, ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ನಿಲ್ಲಿಸಬಹುದು.\n\nಇದನ್ನು ಮುಂದುವರಿಸಿದ್ದಲ್ಲಿ, ಬ್ಯಾಟರಿ ಕಾರ್ಯಕ್ಷಮತೆ ಸುಧಾರಿಸಲು ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅಸ್ಥಾಪಿಸಬೇಕಾಗುತ್ತದೆ."</string>
@@ -2146,6 +2199,8 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"ಮಾಧ್ಯಮಸರ್ವರ್"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"ಅಪ್ಲಿಕೇಶನ್ ಆಪ್ಟಿಮೈಸೇಷನ್‌"</string>
     <string name="battery_saver" msgid="8172485772238572153">"ಬ್ಯಾಟರಿ ಸೇವರ್‌‌"</string>
+    <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+    <skip />
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗುವಿಕೆ"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"ಎಂದಿಗೂ ಬೇಡ"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"ಬ್ಯಾಟರಿಯಲ್ಲಿ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2366,6 +2421,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"ಖಾತೆಯನ್ನು ತೆಗೆದುಹಾಕುವುದೇ?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"ಈ ಖಾತೆಯನ್ನು ತೆಗೆದುಹಾಕುವುದರಿಂದ ಟ್ಯಾಬ್ಲೆಟ್‌ನಲ್ಲಿರುವ ಅದರ ಎಲ್ಲ ಸಂದೇಶಗಳು, ಸಂಪರ್ಕಗಳು ಮತ್ತು ಇತರೆ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"ಈ ಖಾತೆಯನ್ನು ತೆಗೆದುಹಾಕುವುದರಿಂದ ಫೋನ್‌ನಲ್ಲಿರುವ ಅದರ ಸಂದೇಶಗಳು, ಸಂಪರ್ಕಗಳು, ಮತ್ತು ಇತರ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ!"</string>
+    <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+    <skip />
     <string name="remove_account_failed" msgid="3901397272647112455">"ಈ ಬದಲಾವಣೆಗೆ ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಅನುಮತಿಸುವುದಿಲ್ಲ"</string>
     <string name="provider_label" msgid="7724593781904508866">"ಚಂದಾದಾರಿಕೆಗಳನ್ನು ಒತ್ತಿ"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2890,8 +2947,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"ದೃಶ್ಯ ಅಡಚಣೆಗಳನ್ನು ನಿರ್ಬಂಧಿಸಿ"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"ದೃಶ್ಯ ಸಂಕೇತಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"ಸೇರಿಸಿ"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ಈಗ ಆನ್ ಮಾಡಿ"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"ಈಗ ಆಫ್ ಮಾಡಿ"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"ಇದೀಗ ಆನ್ ಮಾಡಿ"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"ಈಗ ಆಫ್ ಮಾಡಿ"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ <xliff:g id="FORMATTED_TIME">%s</xliff:g> ವರೆಗೆ ಆನ್ ಆಗಿದೆ"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"ನೀವು ಅದನ್ನು ಆಫ್ ಮಾಡುವವರೆಗೆ ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಹಾಗೆಯೇ ಇರುತ್ತದೆ"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಅನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ (<xliff:g id="RULE_NAME">%s</xliff:g>) ನಿಯಮದ ಮೂಲಕ ಆನ್ ಮಾಡಲಾಗಿದೆ"</string>
@@ -2930,7 +2987,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"ಅಪ್ಲಿಕೇಶನ್‌ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"ಅಧಿಸೂಚನೆ ವರ್ಗ"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"ಅಧಿಸೂಚನೆ ವರ್ಗ ಗುಂಪು"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"ಪ್ರಾಮುಖ್ಯತೆ"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"ವರ್ತನೆ"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"ಧ್ವನಿಗೆ ಅನುಮತಿ ನೀಡಿ"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"ಎಂದಿಗೂ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸಬೇಡಿ"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ಯಾವುದೇ ಧ್ವನಿ ಅಥವಾ ದೃಶ್ಯ ಅಡಚಣೆಗಳಿಲ್ಲ"</string>
@@ -2948,6 +3005,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"ಮಧ್ಯಮ ಪ್ರಾಮುಖ್ಯತೆ"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"ಉನ್ನತ ಪ್ರಾಮುಖ್ಯತೆ"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"ತುರ್ತು ಪ್ರಾಮುಖ್ಯತೆ"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"ಅಧಿಸೂಚನೆ ತೋರಿಸಿ"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"ಅಧಿಸೂಚನೆ ಸಹಾಯಕ"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"ಅಧಿಸೂಚನೆ ಪ್ರವೇಶ"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್‌ ಅಧಿಸೂಚನೆಗಳಿಗೆ ಪ್ರವೇಶವನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
@@ -2978,9 +3036,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಪ್ರವೇಶಿಸುವಿಕೆ"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ಯಾವುದೇ ಸ್ಥಾಪಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಪ್ರವೇಶಿಸುವಿಕೆಯನ್ನು ವಿನಂತಿಸಿಲ್ಲ"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"ಈ ಸಾಧನದಲ್ಲಿ ಗೋಚರವಾಗುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಅಧಿಸೂಚನೆಗಳನ್ನು Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"ಈ ಸಾಧನದಲ್ಲಿ ಗೋಚರವಾಗುವ ಈ ಪ್ರಕಾರದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಅಧಿಸೂಚನೆಗಳನ್ನು Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"ಈ ಸಾಧನದಲ್ಲಿ ಗೋಚರವಾಗುವ ಈ ಅಧಿಸೂಚನೆಗಳ ಗುಂಪನ್ನು Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"ನಿಮ್ಮ ವಿನಂತಿಯ ಮೇರೆಗೆ, ಈ ಸಾಧನದಲ್ಲಿ ಗೋಚರವಾಗುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಅಧಿಸೂಚನೆಗಳನ್ನು Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"ನಿಮ್ಮ ವಿನಂತಿಯ ಮೇರೆಗೆ ಈ ಸಾಧನದಲ್ಲಿ ಗೋಚರವಾಗುವ ಈ ಪ್ರಕಾರದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಅಧಿಸೂಚನೆಗಳನ್ನು Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"ನಿಮ್ಮ ವಿನಂತಿಯ ಮೇರೆಗೆ, ಈ ಸಾಧನದಲ್ಲಿ ಗೋಚರವಾಗುವ ಈ ಅಧಿಸೂಚನೆಗಳ ಗುಂಪನ್ನು Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
     <string name="notification_channels" msgid="5346841743182627500">"ವಿಭಾಗಗಳು"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"ಇತರೆ"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3559,31 +3617,10 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"ಹಲವು ಸಾಧನಗಳಿಗೆ ಸಂಪರ್ಕಿಸಲಾಗಿದೆ"</string>
     <string name="demo_mode" msgid="2798762752209330277">"ಸಿಸ್ಟಂ UI ಡೆಮೋ ಮೋಡ್"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"ಡೆವಲಪರ್ ಟೈಲ್ಸ್‌ನ ತ್ವರಿತ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"ಸಹಾಯಕ್ಕೆ ನಾವು ಇಲ್ಲಿದ್ದೇವೆ"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"ನಿಮಗಾಗಿ ನಾವು 24/7 ಇಲ್ಲಿರುತ್ತೇವೆ"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"ನಿಮಗಾಗಿ ನಾವು 24 7 ಇಲ್ಲಿರುತ್ತೇವೆ"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"ಯಾವುದೇ ಸಮಸ್ಯೆಯನ್ನು ಇತ್ಯರ್ಥಗೊಳಿಸಲು ನಮ್ಮ ಸಹಾಯ ತಂಡವು ಇಲ್ಲಿದೆ"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"ನಮ್ಮ ಬೆಂಬಲ ತಂಡವು ದಿನದಾದ್ಯಂತ ಪ್ರತಿ ದಿನ ಲಭ್ಯವಿರುತ್ತದೆ"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"ಸಹಾಯವನ್ನು ಹುಡುಕಿ ಅಥವಾ ಬೆಂಬಲದ ಸಮಯದ ಅವಧಿಯಲ್ಲಿ (ಸ್ಥಳೀಯ ಸಮಯ) ಹಿಂತಿರುಗಿ:&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"ಫೋನ್ ಬೆಂಬಲ ಸಮಯ (ಸ್ಥಳೀಯ ಸಮಯ)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"ಸಹಾಯಕ್ಕಾಗಿ ಹುಡುಕಿ ಅಥವಾ ಸುಳಿವುಗಳು &amp; ಕೈಚಳಕಗಳನ್ನು ಎಕ್ಸ್‌ಪ್ಲೋರ್ ಮಾಡಿ"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"ಬೆಂಬಲ:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"ವಿದೇಶಕ್ಕೆ ಪ್ರಯಾಣಿಸುತ್ತಿರುವಿರಾ?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"ಅಂತಾರಾಷ್ಟ್ರೀಯ ದರಗಳು ಅನ್ವಯವಾಗಬಹುದು"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"ಫೋನ್"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"ಚಾಟ್"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"ಸಲಹೆಗಳು ಮತ್ತು ತಂತ್ರಗಳನ್ನು ಎಕ್ಸ್‌ಪ್ಲೋರ್ ಮಾಡಿ"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"ಸಹಾಯ ಹುಡುಕಾಟ ಮತ್ತು ಪ್ರತಿಕ್ರಿಯೆ ಕಳುಹಿಸಿ"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"ಸಂಪರ್ಕ ಬೆಂಬಲ"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"ಸೈನ್‌ ಇನ್‌"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"ಸೈನ್ ಇನ್ ಆಗಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲವೇ?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"ಸಿಸ್ಟಂ ಮಾಹಿತಿಯನ್ನು ಕಳುಹಿಸಿ"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"ಮತ್ತೆ ತೋರಿಸಬೇಡ"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"ಇದರಂತೆ ವಿನಂತಿಸಲಾಗುತ್ತಿದೆ"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"ಖಾತೆ ಸೇರಿಸಿ"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"ಸಿಸ್ಟಂ ಮಾಹಿತಿ"</string>
+    <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+    <skip />
+    <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+    <skip />
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"ಸಂಪರ್ಕ ಹುಡುಕಿ"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"ಕರೆದಾತರು ಮತ್ತು ಸಂಪರ್ಕಗಳನ್ನು ಗುರುತಿಸಲು ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ಮೂಲಕ ಸಂಪರ್ಕ ಹುಡುಕಾಟಗಳಿಗೆ ಅನುಮತಿಸಿ"</string>
@@ -3599,11 +3636,12 @@
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ಸೆಕೆಂಡುಗಳು</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ಸೆಕೆಂಡುಗಳು</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> ಕಾಯಿರಿ"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"ಸಂಗ್ರಹಣೆಯನ್ನು ನಿರ್ವಹಿಸಿ"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"ಸಂಗ್ರಹಣೆ ಸ್ಥಳಾವಕಾಶ ಮುಕ್ತಗೊಳಿಸುವಲ್ಲಿ ಸಹಾಯ ಮಾಡಲು, ಸಂಗ್ರಹಣೆ ನಿರ್ವಾಹಕವು ಬ್ಯಾಕಪ್ ಮಾಡಲಾದ ಫೋಟೋಗಳು ಮತ್ತು ವೀಡಿಯೊಗಳನ್ನು ನಿಮ್ಮ ಸಾಧನದಿಂದ ತೆಗೆದುಹಾಕುತ್ತದೆ."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ಫೋಟೋಗಳು ಮತ್ತು ವೀಡಿಯೊಗಳನ್ನು ತೆಗೆದುಹಾಕಿ"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"ಸಂಗ್ರಹಣೆ ನಿರ್ವಾಹಕ"</string>
+    <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+    <skip />
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"ಸ್ವಯಂಚಾಲಿತ"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"ಹಸ್ತಚಾಲಿತ"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"ಈಗ ಸ್ಥಳಾವಕಾಶವನ್ನು ಮುಕ್ತಗೊಳಿಸಿ"</string>
@@ -3769,8 +3807,10 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ನಿಮ್ಮ ಹೊಸ ಟ್ಯಾಬ್ಲೆಟ್‌ನ ಬಳಕೆ ಪ್ರಾರಂಭಿಸಿ"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"ನಿಮ್ಮ ಹೊಸ ಸಾಧನದ ಬಳಕೆಯನ್ನು ಪ್ರಾರಂಭಿಸಿ"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ಈ ಸಾಧನದಲ್ಲಿ ಈ ವೀಡಿಯೊ ಲಭ್ಯವಿಲ್ಲ"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"ಫೋರ್ಸ್‌ ಫುಲ್ GNSS ಅಳತೆಗಳು"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"ಯಾವುದೇ ಡ್ಯೂಟಿ ಸೈಕ್ಲಿಂಗ್ ಇಲ್ಲದೆ ಎಲ್ಲಾ GNSS ಕಾನ್ಸ್ಟಲೇಶನ್‌ಗಳು ಮತ್ತು ಆವರ್ತನೆಗಳನ್ನು ಟ್ರ್ಯಾಕ್ ಮಾಡಿ"</string>
+    <!-- no translation found for storage_access (8905018810338984531) -->
     <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+    <!-- no translation found for keywords_storage_access (3708874088152933579) -->
     <skip />
 </resources>
diff --git a/res/values-ky/arrays.xml b/res/values-ky/arrays.xml
index cd61471..443b55a 100644
--- a/res/values-ky/arrays.xml
+++ b/res/values-ky/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Начар"</item>
     <item msgid="2042505933058940139">"Начар"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"60 күндөн мурунку"</item>
     <item msgid="5692284879054004388">"90 күндөн мурунку"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"Тармакты колдонуу"</item>
+    <item msgid="8745603368609022803">"Ченелет"</item>
+    <item msgid="2266114985518865625">"Ченелбейт"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 4bce592..b528e1c 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -169,6 +169,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Түзмөктөрүңүз"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Жаңы түзмөктү жупташтыруу"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"Түзмөккө башка bluetooth түзмөктөрү менен жупташтырылып, туташууга уруксат берүү"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Канал аралык чалууну өчүрүү"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Bluetooth гарнитураларында жеке рингтондор ойнотулбасын"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Учурда туташтырылган"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"Сакталган түзмөктөр"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"Түзмөктү кошуу"</string>
@@ -329,6 +331,16 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"Күндү коюу"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Алфавит боюнча иргөө"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Убакыт алкагы боюнча иргөө"</string>
+    <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+    <skip />
+    <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+    <skip />
+    <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+    <skip />
     <string name="date_picker_title" msgid="1338210036394128512">"Күн"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Убакыт"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Автокулпу"</string>
@@ -347,6 +359,8 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Профилдин чоо-жайы"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Каттоо эсептери"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Жайгашкан жер"</string>
+    <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+    <skip />
     <string name="account_settings_title" msgid="626177544686329806">"Каттоо эсептери"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"Коопсуздук жана жайгашкан жер"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифрлөө жана эсептик дайындар"</string>
@@ -690,6 +704,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Катуу сүйлөткүч телефон катары"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Музыка жана медиа үчүн"</string>
     <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="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>
@@ -704,6 +720,8 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Аты"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 ГГц"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 ГГц"</string>
+    <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+    <skip />
     <string name="link_speed" msgid="8896664974117585555">"%1$d Мгб"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> бул түзмөктө WiFi\'ды күйгүзгөнү жатат"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> бул түзмөктө WiFi\'ды өчүргөнү жатат"</string>
@@ -721,6 +739,8 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi‑Fi\'ды жандыруу"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+    <skip />
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi тууралоолору"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Зымсыз кошулуу түйүндөрүн орнотуу жана башкаруу"</string>
@@ -832,7 +852,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS жеткиликтүү)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Тармактагы сырсөзүңүздү киргизиңиз"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"Оператордун Wi‑Fi тармагы"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> аркылуу туташуу"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> аркылуу туташуу"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Жайгаштыруунун тактыгын жогорулатуу жана башка максаттарда, Wi-Fi өчүк болсо да, <xliff:g id="APP_NAME">%1$s</xliff:g> желелерди скандагысы келет.\n\nБардык скандоону кааалаган колдонмолорго уруксат берелсинби?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Муну өчүрүү үчүн, жөндөөлөр менюсунан Өркүндөтүлгөндөргө өтүңүз."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Уруксат"</string>
@@ -908,10 +928,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP жыштыгы"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Башка түзмөктөрүңүзгө Wi‑Fi тармагын түзүү үчүн туташуу түйүнү режимин пайдаланыңыз. Туташуу түйүнү аркылуу башка түзмөктөр сиздин мобилдик Интернетти колдонот. Мобилдик Интернет үчүн кошумча акы алынышы мүмкүн."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Жакын жердеги түзмөктөр менен мазмунду бөлүшүү үчүн колдонмолор хотспот болуп бере алышат."</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Туташуу түйүнү автоматтык түрдө өчүрүлсүн"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Туташкан түзмөктөр жок болсо, Wi‑Fi туташуу түйүнү өчүп калат"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Хотспот жандырылууда…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Хоспот өчүрүлүүдө…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> иштеп жатат"</string>
@@ -960,6 +978,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"Өзгөчө кырдаалда кайрыла турган дарек"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"WiFi аркылуу өзгөчө кырдаалдар кызматынын номерине чалганыңызда куткаруучуларга жайгашкан жериңиз катары көрсөтүлөт"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958">"Жеке DNS функциялары жөнүндө "<annotation id="url">"кененирээк маалымат"</annotation>" алыңыз"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Үн"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Үн бийиктиги"</string>
@@ -1307,6 +1326,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Сиздин жаңы <xliff:g id="NAME">^1</xliff:g> иштеп жатат. \n\nСүрөттөр, файлдар жана колдонмо дайындарын бул түзмөккө жылдыруу үчүн, Жөндөөлөр &gt; Сактагычка өтүңүз."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> колдонмосун жылдыруу"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> жана анын дайындарын <xliff:g id="NAME_0">^2</xliff:g> ичине жылдыруу бир нече көз ирмемге гана созулат. Жылдыруу аяктамайынча колдонмону пайдалана албай каласыз. \n\nЖылдыруу учурунда <xliff:g id="NAME_1">^2</xliff:g> түзмөгүн чыгарбаңыз."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Дайындарды жылдыруу үчүн <xliff:g id="APP">^1</xliff:g> бөгөттөн чыгарылышы керек."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> жылдырылууда…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Жылдыруу учурунда <xliff:g id="NAME">^1</xliff:g> түзмөгүн чыгарбаңыз. \n\nУшул түзмөктөгү <xliff:g id="APP">^2</xliff:g> колдонмосу жылдыруу аяктагыча жеткиликтүү болбойт."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Жылдырууну жокко чыгаруу"</string>
@@ -1467,6 +1487,8 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"Жайгаштыруу булактары"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Планшет жөнүндө"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Телефон жөнүндө"</string>
+    <!-- no translation found for about_settings (6717640957897546887) -->
+    <skip />
     <string name="about_settings" product="emulator" msgid="221313099578564438">"Эмуляцияланган түзмөк жөнүндө"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Юридикалык маалыматты, абалын, программа версиясын көрүү"</string>
     <string name="legal_information" msgid="5769301644270604095">"Юридикалык маалыматтар"</string>
@@ -1574,6 +1596,8 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"<xliff:g id="COUNT">%1$d</xliff:g> колдонмонун баарын көрүү"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Планшетиңиз жана жеке дайындарыңыз белгисиз колдонмолордон зыян тартып калышы мүмкүн. Бул булактан келген колдонмолорду орнотуу менен, аларды пайдалануудан улам планшетиңизге кандайдыр бир зыян келтирилсе же дайындарыңызды жоготуп алсаңыз, өзүңүз жооптуу болосуз."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Телефонуңуз жана жеке дайындарыңыз белгисиз колдонмолордон зыян тартып калышы мүмкүн. Бул булактан келген колдонмолорду орнотуу менен, аларды пайдалануудан улам телефонуңузга кандайдыр бир зыян келтирилсе же дайындарыңызды жоготуп алсаңыз, өзүңүз жооптуу болосуз."</string>
+    <!-- no translation found for install_all_warning (3648003301476423145) -->
+    <skip />
     <string name="advanced_settings" msgid="1777249286757067969">"Өркүндөтүлгөн жөндөөлөр"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Көбүрөөк тууралоо опцияларын көрсөтүү"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Колдонмо тууралуу"</string>
@@ -1873,6 +1897,12 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Түзмөктүн иштешине кедергисин тийгизиши мүмкүн"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Көрсөткүч токтогондо басуу"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Баскыч басылганга чейин кармалган убакыт"</string>
+    <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+    <skip />
+    <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+    <skip />
+    <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+    <skip />
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"КҮЙҮК"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ӨЧҮК"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Ылдам тууралоолор абалында көргөзүү"</string>
@@ -2029,14 +2059,37 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Түзмөк фондо ойготулууда"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Жайгашкан жер көп суралууда"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> колдонмо кызыктай иштеп жатат"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Батарейкасы толук"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Колдонмолор туура иштеп жатышат"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Батарея азыр отуруп калат"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Батарея бир аздан кийин отуруп калат"</string>
+    <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+    <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Телефон өтө көп колдонулду"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Планшет өтө көп колдонулду"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Түзмөк өтө көп колдонулду"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Акыркы жолу толук кубатталгандан бери <xliff:g id="HOUR">%1$s</xliff:g> саат колдонулду"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Телефонуңуз өтө көп колдонулду, андыктан батареясы да көп сарпталды. Болбосо, батарея туура иштеп жатат.\n\n Батареяны акыркы жолу толук кубаттагандан бери телефонуңуз <xliff:g id="HOUR">%1$s</xliff:g> саат колдонулду.\n\n Жалпы колдонулушу:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Планшетиңиз өтө көп колдонулду, андыктан батареясы да көп сарпталды. Болбосо, батарея туура иштеп жатат.\n\n Батареяны акыркы жолу толук кубаттагандан бери планшетиңиз <xliff:g id="HOUR">%1$s</xliff:g> саат колдонулду.\n\n Жалпы колдонулушу:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Түзмөгүңүз өтө көп колдонулду, андыктан батареясы да көп сарпталды. Болбосо, батарея туура иштеп жатат.\n\n Батареяны акыркы жолу толук кубаттагандан бери түзмөгүңүз <xliff:g id="HOUR">%1$s</xliff:g> саат колдонулду.\n\n Жалпы колдонулушу:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"Акылдуу батареяны үнөмдөгүч"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"Батареяны автоматтык түрдө башкаруу"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"Колдонулганына жараша батареяны колдонмолордун ортосунда автоматтык түрдө бөлүштүрүү"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"Чектелген колдонмолор"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="other">%1$d колдонмо</item>
+      <item quantity="one">%1$d колдонмо</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"Колдонмону токтотосузбу?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"<xliff:g id="APP">%1$s</xliff:g> колдонмосу телефонуңузга көшүү режимине өткөнгө мүмкүнчүлүк бербей жаткандыктан, анын батареясы тез отуруп калып жатат.\n\nМаселени чечүү үчүн колдонмону мажбурлап токтотуп коюңуз.\n\nЭгер көйгөй кайталана берсе, колдонмону телефондон чыгарып салууга туура келет."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"<xliff:g id="APP">%1$s</xliff:g> колдонмосу планшетиңизге көшүү режимине өткөнгө мүмкүнчүлүк бербей жаткандыктан, анын батареясы тез отуруп калып жатат.\n\nМаселени чечүү үчүн колдонмону мажбурлап токтотуп коюңуз.\n\nЭгер көйгөй кайталана берсе, колдонмону планшеттен чыгарып салууга туура келет."</string>
@@ -2145,6 +2198,8 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Медиа сервер"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Колдонмону оптималдаштыруу"</string>
     <string name="battery_saver" msgid="8172485772238572153">"Батареяны үнөмдөгүч"</string>
+    <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+    <skip />
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Автоматтык түрдө күйгүзүү"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Эч качан"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> батарея менен"</string>
@@ -2369,6 +2424,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"Эсеп жок кылынсынбы?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Бул эсепти жок кылуу, анын бардык билдирүүлөрүн, байланыштарын жана башка берилиштерин планшеттен өчүрүлүшүнө алып келет!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Бул эсепти жок кылуу, анын бардык билдирүүлөрүн, байланыштарын жана башка берилиштерин телефондон өчүрүлүшүнө алып келет!"</string>
+    <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+    <skip />
     <string name="remove_account_failed" msgid="3901397272647112455">"Мындай өзгөртүүгө администраторуңуз тыюу салган"</string>
     <string name="provider_label" msgid="7724593781904508866">"Жазылууларды көрсөтүү"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2893,8 +2950,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Визуалдык эскертмелерди бөгөттөө"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Визуалдык сигнал иштетилсин"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"Кошуу"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"АЗЫР КҮЙГҮЗҮЛСҮН"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"АЗЫР ӨЧҮРҮЛСҮН"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Азыр күйгүзүлсүн"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Азыр өчүрүлсүн"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> чейин \"Тынчымды алба\" режими күйгүзүлгөн"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Сиз өчүрмөйүнчө, \"Тынчымды алба\" режими күйүп турат"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"\"Тынчымды алба\" режими автоматтык түрдө <xliff:g id="RULE_NAME">%s</xliff:g> эрежесине ылайык күйгүзүлдү"</string>
@@ -2933,7 +2990,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Колдонмо эскертмелери"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Эскертменин категориясы"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"Эскертменин категория тобу"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"Маанилүүлүгү"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"Аракеттер"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"Добуш чыгарууга уруксат берүү"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Эскертмелер эч качан көрсөтүлбөсүн"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Добуш да чыгарбасын, экранда да көрсөтүлбөсүн"</string>
@@ -2951,6 +3008,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Орточо"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Маанилүү"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"Өтө маанилүү"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"Эскертмелерди көрсөтүү"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Эскертме жардамчысы"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Эскертмелерди иштетүү"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Жумуш профилинин эскертмелерине кирүү бөгөттөлгөн"</string>
@@ -2981,9 +3039,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"\"Тынчымды алба\" функциясы"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Орнотулган колдонмолор үчүн \"Тынчымды алба\" функциясы талап кылынбайт"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Колдонмолор жүктөлүүдө…"</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android тутуму бул колдонмонун эскертмелерин бул түзмөктөн көрсөтпөй, бөгөттөп жатат"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android тутуму ушул категориядагы эскертмелерди бул түзмөктөн көрсөтпөй, бөгөттөп жатат"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android тутуму ушул топтогу эскертмелерди бул түзмөктөн көрсөтпөй, бөгөттөп жатат"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"Суранычыңыз боюнча Android бул колдонмонун эскертмелерин бул түзмөктөн көрсөтпөй, бөгөттөп жатат"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Суранычыңыз боюнча Android тутуму ушул категориядагы эскертмелерди бул түзмөктөн көрсөтпөй, бөгөттөп жатат"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Суранычыңыз боюнча Android тутуму ушул топтогу эскертмелерди бул түзмөктөн көрсөтпөй, бөгөттөп жатат"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Категориялар"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Башка"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3562,31 +3620,10 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Бир нече түзмөккө туташты"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Тутум интерфейсинин демо режими"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Иштеп чыгуучунун ыкчам жөндөөлөр такталары"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"Жардам берүүгө даярбыз"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Кардарларды колдоо кызматы күнү-түнү иштейт"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Колдоо кызматы күнү-түнү иштейт"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"Колдоо кызматыбыздын жамааты бардык маселелерди чечүүгө жардам берет"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Колдоо бөлүмүбүздүн жамааты күн сайын тынымсыз иштейт"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Интернеттен жардам издеп көрүңүз же колдоо көрсөтүү сааттарында (жергиликтүү убакыт боюнча) кайрылып көрүңүз:&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Телефон аркылуу колдоо көрсөтүү сааттары (жергиликтүү убакыт боюнча)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Издөө боюнча жардам берилип, издөө кеңештери менен ыкмалары көрсөтүлөт"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"Колдоого алынган өлкө:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"Чет өлкөгө саякатка чыгып жатасызбы?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"Эл аралык байланыш акысын төлөп калышыңыз мүмкүн"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Телефон"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"Маек"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Сунуштар жана пайдалуу кеңештер"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Издөө боюнча жардам алуу/Пикир билдирүү"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"Колдоо кызматына кайрылуу"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Кирүү"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"Кире албай жатасызбы?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"Тутум маалыматын жөнөтүү"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Экинчи көрсөтүлбөсүн"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"Ким кайрылып жатат:"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"Каттоо эсебин кошуу"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"Тутумдун маалыматы"</string>
+    <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+    <skip />
+    <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+    <skip />
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Жумуш профилинин жөндөөлөрү"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Байланыштарды издөө"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Чалуучуларды жана байланыштарды аныктоо үчүн ишканаңыз байланыштарды издешине уруксат бериңиз"</string>
@@ -3602,11 +3639,12 @@
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> секунд</item>
       <item quantity="one">1 секунд</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> күтө туруңуз"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Сактагычты башкаруу"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Орун бошотуу үчүн сактагычты көзөмөлдөгүч камдык көчүрмөсү сакталган сүрөттөр менен видеолорду жок кылат."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Сүрөттөрдү жана видеолорду алып салуу"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Сактагычты көзөмөлдөгүч"</string>
+    <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+    <skip />
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Автоматтык"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Нускама"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Орун бошотуу"</string>
@@ -3772,8 +3810,10 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Жаңы планшетиңизди карап чыгыңыз"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Жаңы түзмөгүңүзду карап чыгыңыз"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Бул функция бул түзмөктө иштебейт"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"GNSS көрсөткүчтөрүн иштетүү"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Милдеттүү иштөөнү өчүрүп, бардык GNSS топторуна жана жыштыктарга көз салуу"</string>
+    <!-- no translation found for storage_access (8905018810338984531) -->
     <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+    <!-- no translation found for keywords_storage_access (3708874088152933579) -->
     <skip />
 </resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 61c3ddb..6c13ed5 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Prastas"</item>
     <item msgid="2042505933058940139">"Prastas"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"Daugiau nei 60 dienų"</item>
     <item msgid="5692284879054004388">"Daugiau nei 90 dienų"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"Naudoti pageidaujamą tinklą"</item>
+    <item msgid="8745603368609022803">"Laikyti matuojamu"</item>
+    <item msgid="2266114985518865625">"Laikyti nematuojamu"</item>
+  </string-array>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 2ecc8bc..16475f2 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -172,6 +172,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Jūsų įrenginiai"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Susieti naują įrenginį"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"Leisti įrenginiui susieti ir prisijungti prie „Bluetooth“ įrenginių"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Išjungti diapazono skambėjimą"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Neleisti tinkintų telefono skambėjimo tonų per „Bluetooth“ ausines"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Šiuo metu prisijungta"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"Išsaugoti įrenginiai"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"Pridėti įrenginį"</string>
@@ -334,6 +336,11 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"Nustatyti datą"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Rūšiuoti pagal abėcėlę"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Rūšiuoti pagal laiko juostą"</string>
+    <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> prasideda <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+    <string name="zone_time_type_dst" msgid="8850494578766845276">"Vasaros laikas"</string>
+    <string name="zone_time_type_standard" msgid="3462424485380376522">"Standartinis laikas"</string>
+    <string name="zone_menu_by_region" msgid="4603214570803607532">"Laiko juosta pagal regioną"</string>
+    <string name="zone_menu_by_offset" msgid="1172774718486088771">"Fiksuoto poslinkio laiko juostos"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Laikas"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Automatiškai užrakinti"</string>
@@ -352,6 +359,7 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Profilio informacija"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Paskyros"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Vietovė"</string>
+    <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Naudoti vietovę"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Paskyros"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"Saugumas ir vieta"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifruotė ir prisijungimo duomenys"</string>
@@ -713,6 +721,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kaip kalbėtojo telefonas"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Muzikai ir medijai"</string>
     <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>
     <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>
@@ -727,6 +737,7 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Pavadinimas"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Prisijungti"</string>
     <string name="link_speed" msgid="8896664974117585555">"%1$d MB per sek."</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"Programa „<xliff:g id="REQUESTER">%s</xliff:g>“ nori įjungti „Wi-Fi“"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"Programa „<xliff:g id="REQUESTER">%s</xliff:g>“ nori išjungti „Wi-Fi“"</string>
@@ -744,6 +755,7 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Įjungti „Wi-Fi“"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Naudoti „Wi-Fi“"</string>
     <string name="wifi_settings_category" msgid="8719175790520448014">"„Wi-Fi“ nustatymai"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Nustatyti ir valdyti bevielius prieigos taškus"</string>
@@ -855,7 +867,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (galima WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Įveskite tinklo slaptažodį"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"Operatoriaus „Wi‑Fi“ ryšio tinklas"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"Prisijunkite per „<xliff:g id="NAME">%1%s</xliff:g>“"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Prisijunkite per „<xliff:g id="NAME">%1$s</xliff:g>“"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Siekiant tiksliau nustatyti vietą ir dėl kitų priežasčių, „<xliff:g id="APP_NAME">%1$s</xliff:g>“ prašo leidimo nuskaityti tinklus, net kai „Wi-Fi“ yra išjungtas.\n\nAr norite suteikti leidimą nuskaityti visoms to prašančioms programoms?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Kad išjungtumėte, perpildymo meniu eikite į skiltį „Išplėstiniai“"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Leisti"</string>
@@ -933,10 +945,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Prieigos taško juosta"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Naudodami viešosios interneto prieigos tašką, galite sukurti „Wi‑Fi“ tinklą kitiems įrenginiams. Internetas teikiamas per viešosios interneto prieigos tašką naudojant mobiliųjų duomenų ryšį. Gali būti taikomi papildomi mobiliojo ryšio duomenų mokesčiai."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Programos gali sukurti viešosios interneto prieigos tašką ir bendrinti turinį su netoliese esančiais įrenginiais."</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Išjungti viešosios interneto prieigos tašką automatiškai"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"„Wi‑Fi“ viešosios interneto prieigos taškas bus išjungtas, jei nebus prijungta jokių įrenginių"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Įjungiamas viešosios interneto prieigos taškas…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Išjungiamas viešosios interneto prieigos taškas…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktyvus"</string>
@@ -985,6 +995,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"Adresas prireikus pagalbos"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Naudojama kaip vietos informacija, kai skambinate pagalbos numeriu naudodami „Wi-Fi“"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Sužinokite daugiau"</annotation>" apie privataus DNS funkcijas"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekranas"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Garsas"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Garsumas"</string>
@@ -1334,6 +1345,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Nauja <xliff:g id="NAME">^1</xliff:g> veikia. \n\nKad perkeltumėte nuotraukas, failus ir programų duomenis į šį įrenginį, eikite į skiltį „Nustatymai“ &gt; „Atmintis“."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Perkelti programą <xliff:g id="APP">^1</xliff:g>"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Programos <xliff:g id="APP">^1</xliff:g> ir jos duomenų perkėlimas į <xliff:g id="NAME_0">^2</xliff:g> truks neilgai. Negalėsite naudoti programos, kol perkėlimas bus baigtas. \n\nKol perkeliama, nepašalinkite <xliff:g id="NAME_1">^2</xliff:g>."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Jei norite perkelti duomenis, turite atrakinti naudotoją <xliff:g id="APP">^1</xliff:g>."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Perkeliama programa <xliff:g id="APP">^1</xliff:g>…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Nepašalinkite <xliff:g id="NAME">^1</xliff:g>, kol perkeliama. \n\nPrograma <xliff:g id="APP">^2</xliff:g> šiame įrenginyje nebus pasiekiama, kol perkėlimas bus baigtas."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Atšaukti perkėlimą"</string>
@@ -1494,6 +1506,7 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"Vietovės šaltiniai"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Apie planšetinį kompiuterį"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Apie telefoną"</string>
+    <string name="about_settings" product="device" msgid="6717640957897546887">"Apie įrenginį"</string>
     <string name="about_settings" product="emulator" msgid="221313099578564438">"Apie emuliuojamą įrenginį"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Žiūrėti teisinę informaciją, būseną, programinės įrangos versiją"</string>
     <string name="legal_information" msgid="5769301644270604095">"Teisinė informacija"</string>
@@ -1601,6 +1614,7 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"Žr. visas programas (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Įdiegus nežinomų programų didėja planšetinio kompiuterio ir asmeninių duomenų pažeidimo rizika. Diegdami programas iš šio šaltinio sutinkate, kad esate patys atsakingi už žalą planšetiniam kompiuteriui arba duomenų praradimą dėl jų naudojimo."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Įdiegus nežinomų programų didėja telefono ir asmeninių duomenų pažeidimo rizika. Diegdami programas iš šio šaltinio sutinkate, kad esate patys atsakingi už žalą telefonui arba duomenų praradimą dėl jų naudojimo."</string>
+    <string name="install_all_warning" product="device" msgid="3648003301476423145">"Įdiegus nežinomų programų didėja įrenginio ir asmeninių duomenų pažeidimo rizika. Diegdami programas iš šio šaltinio sutinkate, kad esate patys atsakingi už žalą įrenginiui arba duomenų praradimą dėl programų naudojimo."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Išplėstiniai nustatymai"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Įgalinti daugiau nustatymų parinkčių"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Programos informacija"</string>
@@ -1902,6 +1916,9 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Gali paveikti našumą"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Spustelėkite, kai žymeklis nustos judėti"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Delsa prieš paspaudimą"</string>
+    <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>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ĮJUNGTI"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"IŠJUNGTA"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Rodyti sparčiuosiuose nustatymuose"</string>
@@ -2072,14 +2089,37 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Įrenginys pažadinamas fone"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Dažnai siunčiamos vietos užklausos"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Netinkamai veikiančių programų: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Akumuliatoriaus būsena gera"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Programos veikia įprastai"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Maža akumuliatoriaus talpa"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Akumuliatoriaus veikimo laikas nebus ilgas"</string>
+    <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Įjunkite išmaniąją akumuliatoriaus tvarkytuvę"</string>
+    <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Įjunkite, kad galėtumėte optimizuoti akumuliatoriaus naudojimą"</string>
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
     <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Telefonas naudotas intensyviai"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Planšetinis kompiuteris naudotas intensyviai"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Įrenginys naudotas intensyviai"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Išnaudota maždaug <xliff:g id="HOUR">%1$s</xliff:g> nuo paskutinio visiško įkrovimo"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Telefonas buvo intensyviai naudojamas ir todėl buvo suvartota daug akumuliatoriaus energijos. Akumuliatorius veikia normaliai.\n\n Telefonas buvo naudojamas maždaug <xliff:g id="HOUR">%1$s</xliff:g> nuo paskutinio visiško įkrovimo.\n\n Bendras naudojimas:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Planšetinis kompiuteris buvo intensyviai naudojamas ir todėl buvo suvartota daug akumuliatoriaus energijos. Akumuliatorius veikia normaliai.\n\n Planšetinis kompiuteris buvo naudojamas maždaug <xliff:g id="HOUR">%1$s</xliff:g> nuo paskutinio visiško įkrovimo.\n\n Bendras naudojimas:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Įrenginys buvo intensyviai naudojamas ir todėl buvo suvartota daug akumuliatoriaus energijos. Akumuliatorius veikia normaliai.\n\n Įrenginys buvo naudojamas maždaug <xliff:g id="HOUR">%1$s</xliff:g> nuo paskutinio visiško įkrovimo.\n\n Bendras naudojimas:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"Išmanioji akumuliatoriaus tvarkymo priemonė"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"Automatinis akumuliatoriaus tvarkymas"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"Automatiškai koreguoti programų sunaudojamą energiją atsižvelgiant į naudojimą"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"Apribotos programos"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="one">%1$d programa</item>
+      <item quantity="few">%1$d programos</item>
+      <item quantity="many">%1$d programos</item>
+      <item quantity="other">%1$d programų</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"Sustabdyti programą?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Telefonas negali įprastai tvarkyti akumuliatoriaus, nes „<xliff:g id="APP">%1$s</xliff:g>“ jį pažadina.\n\nKad pabandytumėte išspręsti šią problemą, galite sustabdyti programą.\n\nJei tai kartosis, gali reikėti pašalinti programą, kad pagerintumėte akumuliatoriaus našumą."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Planšetinis kompiuteris negali įprastai tvarkyti akumuliatoriaus, nes „<xliff:g id="APP">%1$s</xliff:g>“ jį pažadina.\n\nKad pabandytumėte išspręsti šią problemą, galite sustabdyti programą.\n\nJei tai kartosis, gali reikėti pašalinti programą, kad pagerintumėte akumuliatoriaus našumą."</string>
@@ -2188,6 +2228,7 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Medijos serveris"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Programų optimizavimas"</string>
     <string name="battery_saver" msgid="8172485772238572153">"Akumuliatoriaus tausojimo priemonė"</string>
+    <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Naudoti Akumuliatoriaus tausojimo priemonę"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Įjungti automatiškai"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Niekada"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"kai akumuliatoriaus įkrovos lygis yra <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2408,6 +2449,7 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"Pašalinti paskyrą?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Pašalinus šią paskyrą iš planšetinio kompiuterio bus ištrinti visi pranešimai, kontaktai ir kiti duomenys!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Pašalinus šią paskyrą iš telefono bus ištrinti visi jos pranešimai, kontaktai ir kiti duomenys!"</string>
+    <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Pašalinus šią paskyrą iš įrenginio bus ištrinti visi pranešimai, kontaktai ir kiti duomenys."</string>
     <string name="remove_account_failed" msgid="3901397272647112455">"Administratorius neleidžia atlikti šio pakeitimo"</string>
     <string name="provider_label" msgid="7724593781904508866">"Paspauskite „Prenumeratos“"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2944,8 +2986,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blokuoti vaizdinius trikdžius"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Leisti vaizdinius signalus"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"Pridėti"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ĮJUNGTI DABAR"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"IŠJUNGTI DABAR"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Įjungti dabar"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Išjungti dabar"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Netrukdymo režimas įjungtas iki <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Netrukdymo režimas bus įjungtas, kol jį išjungsite"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Netrukdymo režimą automatiškai įjungė taisyklė („<xliff:g id="RULE_NAME">%s</xliff:g>“)"</string>
@@ -2984,7 +3026,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Programų pranešimai"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Pranešimo kategorija"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"Pranešimų kategorijos grupė"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"Svarba"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"Elgsena"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"Leisti garsą"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Niekada nerodyti pranešimų"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Neskambėti ir nepertraukti vaizdo"</string>
@@ -3002,6 +3044,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Vidutinė svarba"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Didelė svarba"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"Skubi svarba"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"Rodyti pranešimus"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Pranešimų pagelbiklis"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Prieiga prie pranešimų"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Prieiga prie darbo profilio pranešimų užblokuota"</string>
@@ -3034,9 +3077,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Prieiga „Netrukdyti“"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Jokios įdiegtos programos nepateikė prieigos „Netrukdyti“ užklausos"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Įkeliamos programos..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"„Android“ blokuoja šios programos pranešimus, kad jie nebūtų rodomi šiame įrenginyje"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"„Android“ blokuoja šios kategorijos pranešimus, kad jie nebūtų rodomi šiame įrenginyje"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"„Android“ blokuoja šios grupės pranešimus, kad jie nebūtų rodomi šiame įrenginyje"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"„Android“ jūsų prašymu blokuoja šios programos pranešimus, kad jie nebūtų rodomi šiame įrenginyje"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"„Android“ jūsų prašymu blokuoja šios kategorijos pranešimus, kad jie nebūtų rodomi šiame įrenginyje"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"„Android“ jūsų prašymu blokuoja šios grupės pranešimus, kad jie nebūtų rodomi šiame įrenginyje"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorijos"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Kita"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3651,31 +3694,8 @@
     <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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Sparčiųjų nustatymų kūrėjo išklotinės elementai"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"Esame pasiruošę padėti"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Esame pasiruošę padėti 24 val. per parą, 7 dienas per savaitę"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Esame pasiruošę padėti 24 val. per parą, 7 dienas per savaitę"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"Palaikymo komanda pasiruošusi išspręsti bet kokią kilusią problemą"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Palaikymo komanda pasiekiama visą dieną, kasdien"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Ieškokite pagalbos arba grįžkite palaikymo komandos darbo laiku (vietos laiku):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Palaikymo telefonu komandos darbo laikas (vietos laiku)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Ieškokite pagalbos ir naršykite patarimus bei gudrybes"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"Palaikymas:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"Keliaujate užsienyje?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"Gali būti taikomi tarptautiniai mokesčiai"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefonas"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"Pokalbis"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Naršyti patarimus ir gudrybes"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Ieškoti pagalbos ir siųsti atsiliepimą"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"Susisiekite su palaikymo komanda"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Prisijungti"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"Negalite prisijungti?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"Siųsti sistemos informaciją"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Daugiau nerodyti"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"Užklausa pateikiama kaip"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"Pridėti paskyrą"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"Sistemos informacija"</string>
+    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Lango žymė"</string>
+    <string name="layer_trace_quick_settings_title" msgid="2447147947568109649">"Sluoksnio žymė"</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>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Leiskite nustatyti skambintojus ir kontaktus atliekant organizacijos kontaktų paiešką"</string>
@@ -3697,11 +3717,11 @@
       <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> sekundės</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sekundžių</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Palaukite ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Tvarkyti saugyklą"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Kad padėtų atlaisvinti saugyklos vietos, saugyklos tvarkytuvė iš įrenginio pašalina nuotraukas ir vaizdo įrašus, kurių atsarginė kopija sukurta."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Pašalinti nuotraukas ir vaizdo įrašus"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Saugyklos tvarkytuvė"</string>
+    <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Naudoti Saugyklos tvarkytuvę"</string>
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatiniai"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Neautomatiniai"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Atlaisvinkite vietos dabar"</string>
@@ -3881,8 +3901,8 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Peržiūrėkite naujo planšetinio kompiuterio apžvalgą"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Peržiūrėkite naujo įrenginio apžvalgą"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ši funkcija nepasiekiama šiame įrenginyje"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
-    <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
-    <skip />
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Priversti vykdyti visus GNSS matavimus"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Stebėti visas GNSS konferencijas ir visus dažnius netaikant darbo ciklų"</string>
+    <string name="storage_access" msgid="8905018810338984531">"Saugyklos prieiga"</string>
+    <string name="keywords_storage_access" msgid="3708874088152933579">"saugyklos prieigos tikslinis katalogas"</string>
 </resources>
diff --git a/res/values-mk/arrays.xml b/res/values-mk/arrays.xml
index 39fbcb2..70ec3e2 100644
--- a/res/values-mk/arrays.xml
+++ b/res/values-mk/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Слаба"</item>
     <item msgid="2042505933058940139">"Слаб"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"Постари од 60 дена"</item>
     <item msgid="5692284879054004388">"Постари од 90 дена"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"Користете ги поставките на мрежата"</item>
+    <item msgid="8745603368609022803">"Сметај како ограничена мрежа"</item>
+    <item msgid="2266114985518865625">"Сметај како неограничена мрежа"</item>
+  </string-array>
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 1eadad6..8dd33a3 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ваши уреди"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Спарување нов уред"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"Дозволете уредот да се спарува и поврзува со уреди со Bluetooth"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Оневозможете ѕвонење во појас"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Не пуштајте приспособени мелодии за телефон на слушалки за Bluetooth"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Моментално е поврзана"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"Зачувани уреди"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"Додавање уред"</string>
@@ -330,6 +332,16 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"Постави датум"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Подреди по азбучен ред"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Подреди по временска зона"</string>
+    <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+    <skip />
+    <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+    <skip />
+    <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+    <skip />
     <string name="date_picker_title" msgid="1338210036394128512">"Датум"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Време"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Автоматско заклучување"</string>
@@ -348,6 +360,8 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Информации за профил"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Сметки"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Локација"</string>
+    <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+    <skip />
     <string name="account_settings_title" msgid="626177544686329806">"Сметки"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"Безбедност и локација"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифрирање и акредитиви"</string>
@@ -691,6 +705,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Како интерфон"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"За музика и медиуми"</string>
     <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="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>
@@ -705,6 +721,8 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Име"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+    <skip />
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> сака да ја вклучи Wi-Fi мрежата"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> сака да ја исклучи Wi-Fi мрежата"</string>
@@ -722,6 +740,8 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Вклучи Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+    <skip />
     <string name="wifi_settings_category" msgid="8719175790520448014">"Поставки за Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Постави и управувај со безжични пристапни точки"</string>
@@ -833,7 +853,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Достапен WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Внесете ја вашата мрежна лозинка"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"Wi‑Fi мрежа на операторот"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"Поврзете се преку <xliff:g id="NAME">%1%s</xliff:g>"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Поврзете се преку <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"За да се подобри точноста на локација и за други цели, <xliff:g id="APP_NAME">%1$s</xliff:g> сака да се вклучи скенирање за мрежи  дури и кога Wi-Fi е исклучена.\n\nДозволи го ова за сите апликации кои сакаат да се скенира?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"За да го исклучите ова, одете на Напредни во менито на прелевање."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Дозволи"</string>
@@ -909,10 +929,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Појас на точката на пристап"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Користете точка на пристап за да создадете Wi‑Fi мрежа за другите уреди. Точката на пристап обезбедува интернет со помош на мобилната интернет-врска. Може да ви се наплатат дополнителни трошоци за мобилен интернет."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Апликациите може да создадат точка на пристап за да споделуваат содржини со уредите во близина."</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Автоматско исклучување на точката на пристап"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Точката на пристап преку Wi‑Fi ќе се исклучи ако нема поврзани уреди"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Вклучување точка на пристап..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Исклучување точка на пристап..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> е активно"</string>
@@ -961,6 +979,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"Адреса за итни случаи"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Се користи како ваша локација кога остварувате итен повик преку Wi-Fi"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Дознајте повеќе"</annotation>" за функциите на приватен DNS"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Екран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Јачини"</string>
@@ -1308,6 +1327,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Вашата нова <xliff:g id="NAME">^1</xliff:g> работи. \n\nЗа да преместите фотографии, датотеки и податоци за апликацијата на уредов, одете во Поставки и меморија."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Премести <xliff:g id="APP">^1</xliff:g>"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Преместувањето на <xliff:g id="APP">^1</xliff:g> и нејзините податоци на <xliff:g id="NAME_0">^2</xliff:g> ќе потрае само неколку моменти. Нема да може да ја користите апликацијата додека преместувањето не заврши. \n\nНе отстранувајте ја <xliff:g id="NAME_1">^2</xliff:g> за време на преместувањето."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"За преместување податоци, треба да го отклучите корисникот <xliff:g id="APP">^1</xliff:g>."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Се преместува <xliff:g id="APP">^1</xliff:g>…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Не отстранувајте ја <xliff:g id="NAME">^1</xliff:g> за време на преместувањето. \n\nАпликацијата <xliff:g id="APP">^2</xliff:g> на уредов нема да биде достапна додека преместувањето не заврши."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Откажи преместување"</string>
@@ -1468,6 +1488,8 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"Извори на локација"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"За таблет"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"За телефонот"</string>
+    <!-- no translation found for about_settings (6717640957897546887) -->
+    <skip />
     <string name="about_settings" product="emulator" msgid="221313099578564438">"За емулирани уреди"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Прикажи правни информации, статус, верзија на софтвер"</string>
     <string name="legal_information" msgid="5769301644270604095">"Правни информации"</string>
@@ -1575,6 +1597,8 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"Видете ги сите <xliff:g id="COUNT">%1$d</xliff:g> апликации"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Вашиот таблет и личните податоци се повеќе подложни на напади од апликации од непознати извори. Ако инсталирате апликации од изворов, се согласувате дека сте одговорни за каква било штета на таблетот или губењето податоци што може да произлезат од користењето на овие апликации."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Вашиот телефон и личните податоци се повеќе подложни на напади од апликации од непознати извори. Ако инсталирате апликации од изворов, се согласувате дека сте одговорни за каква било штета на телефонот или губењето податоци што може да произлезат од користењето на овие апликации."</string>
+    <!-- no translation found for install_all_warning (3648003301476423145) -->
+    <skip />
     <string name="advanced_settings" msgid="1777249286757067969">"Напредни поставки"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Овозможи повеќе опции за подесување"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Информации за апликацијата"</string>
@@ -1874,6 +1898,12 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Може да влијае на изведбата"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Кликнување откако покажувачот ќе престане да се движи"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Одложување пред кликнување"</string>
+    <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+    <skip />
+    <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+    <skip />
+    <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+    <skip />
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ВКЛУЧЕНО"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ИСКЛУЧЕНО"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Прикажи во „Брзи поставки“"</string>
@@ -2030,14 +2060,37 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Го активира уредот во заднина"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Често бара локација"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> апликации се однесуваат необично"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Батеријата е во добра форма"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Апликациите се однесуваат нормално"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Низок капацитет на батеријата"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Батеријата не може да обезбеди добар век на траење"</string>
+    <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+    <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Телефонот е користен интензивно"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Таблетот е користен интензивно"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Уредот е користен интензивно"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Користено е околу <xliff:g id="HOUR">%1$s</xliff:g> од последното целосно полнење"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Вашиот телефон се користел интензивно што значително ја испразнило батеријата. Батеријата е исправна.\n\n Телефонот се користел околу <xliff:g id="HOUR">%1$s</xliff:g> од последното целосно полнење.\n\n Вкупно користење:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Вашиот таблет се користел интензивно што значително ја испразнило батеријата. Батеријата е исправна.\n\n Таблетот се користел околу <xliff:g id="HOUR">%1$s</xliff:g> од последното целосно полнење.\n\n Вкупно користење:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Вашиот уред се користел интензивно што значително ја испразнило батеријата. Батеријата е исправна.\n\n Уредот се користел околу <xliff:g id="HOUR">%1$s</xliff:g> од последното целосно полнење.\n\n Вкупно користење:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"Паметен управник со батерија"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"Автоматско управување со батерија"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"Автоматски приспособувај го користењето на батеријата по апликација врз основа на користењето"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"Ограничени апликации"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="one">%1$d апликација</item>
+      <item quantity="other">%1$d апликации</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"Да се исклучи апликацијата?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Телефонот не може да управува со батеријата нормално затоа што <xliff:g id="APP">%1$s</xliff:g> го држи телефонот активен.\n\nЗа да го решите проблемов, може да ја исклучите апликацијата.\n\nАко проблемот постои и понатаму, можеби ќе треба да ја деинсталирате апликацијата за да се подобри изведбата на батеријата."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Таблетот не може да управува со батеријата нормално затоа што <xliff:g id="APP">%1$s</xliff:g> го држи телефонот активен.\n\nЗа да го решите проблемов, може да ја исклучите апликацијата.\n\nАко проблемот постои и понатаму, можеби ќе треба да ја деинсталирате апликацијата за да се подобри изведбата на батеријата."</string>
@@ -2146,6 +2199,8 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Оптимизација на апликација"</string>
     <string name="battery_saver" msgid="8172485772238572153">"Штедач на батерија"</string>
+    <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+    <skip />
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Вклучи автоматски"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Никогаш"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"при <xliff:g id="PERCENT">%1$s</xliff:g> батерија"</string>
@@ -2366,6 +2421,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"Отстрани сметка?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Со отстранување на оваа сметка ќе се избришат сите нејзини пораки, контакти и другите податоци од таблетот!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Со отстранување на оваа сметка ќе се избришат сите нејзини пораки, контакти и другите податоци од телефонот!"</string>
+    <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+    <skip />
     <string name="remove_account_failed" msgid="3901397272647112455">"Администраторот не ја дозволува промената"</string>
     <string name="provider_label" msgid="7724593781904508866">"Рекламни претплати"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2890,8 +2947,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Блокирајте визуелни нарушувања"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Дозволи визуелни сигнали"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"Додај"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ВКЛУЧИ СЕГА"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"ИСКЛУЧИ СЕГА"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Вклучи сега"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Исклучи сега"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Режимот „Не вознемирувај“ ќе биде вклучен до <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Режимот „Не вознемирувај“ ќе биде вклучен сѐ додека не го исклучите"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Дадено правило <xliff:g id="RULE_NAME">%s</xliff:g> го вклучи режимот „Не вознемирувај“ автоматски"</string>
@@ -2930,7 +2987,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Известувања за апликација"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Категорија на известувањето"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"Група на категорија известувања"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"Важност"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"Однесување"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"Дозволете звук"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Никогаш не прикажувај известувања"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Без звук или визуелен прекин"</string>
@@ -2948,6 +3005,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Средна важност"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Голема важност"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"Итна важност"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"Прикажи известувања"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Помошник за известувања"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Пристап до известување"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Пристапот до известувањата на работниот профил е блокиран"</string>
@@ -2978,9 +3036,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Пристап до „Не вознемирувај“"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ниту една од инсталираните апликации не побарала пристап до „Не вознемирувај“"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Вчитување апликации…"</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android го блокира појавувањето на известувањата за апликацијава на уредов"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android го блокира појавувањето на оваа категорија известувања на уредов"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android го блокира појавувањето на оваа група известувања на уредов"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"На ваше барање, Android го блокира појавувањето на известувањата за апликацијава на уредов"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"На ваше барање, Android го блокира појавувањето на оваа категорија известувања на уредов"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"На ваше барање, Android го блокира појавувањето на оваа група известувања на уредов"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Категории"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Друго"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3559,31 +3617,10 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Поврзан со повеќе уреди"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Демо-режим на кориснички интерфејс на систем"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Плочки на програмерот за брзи поставки"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"Тука сме за да ви помогнеме"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Ние сме тука за вас 24/7"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Ние сме тука за вас 24 часа на ден"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"Нашиот тим за поддршка е тука за да ви помогне да се справите со секој проблем"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Нашиот тим за поддршка е достапен по цел ден, секој ден"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Пребарајте помош или обратете се во текот на работното време на поддршката (локално време):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Работно време на поддршката преку телефон (локално време)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Пребарајте ја помошта или истражувајте ги советите и триковите"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"Поддршка за:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"Патувате во странство?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"Може да се применат меѓународни трошоци"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Телефон"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"Разговор"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Истражувајте ги советите и триковите"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Пребарајте помош и испратете повратни информации"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"Контактирајте со поддршката"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Најави се"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"Не може да се најавите?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"Испрати системски информации"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Не покажувај повторно"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"Бара како"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"Додај сметка"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"Системски информации"</string>
+    <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+    <skip />
+    <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+    <skip />
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Поставки на работен профил"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Пребарување контакти"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Дозволете при пребарувањата контакти на вашата организација да се препознаваат повикувачи и контакти"</string>
@@ -3599,11 +3636,12 @@
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> секунди</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> секунди</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> чекање"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Управувајте со меморијата"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"За помош при ослободувањето простор за меморијата, управникот со меморијата ги отстранува резервните копии од фотографиите и видеата од уредот."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Отстранете фотографии и видеа"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Управник со меморија"</string>
+    <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+    <skip />
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Автоматски"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Рачни"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Ослободете простор сега"</string>
@@ -3769,8 +3807,10 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Запознајте се со новиот таблет"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Запознајте се со новиот уред"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Функцијава не е достапна на овој уред"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Присилување целосни мерења со GNSS"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Следете ги сите констелации и фреквенции со GNSS без работен циклус"</string>
+    <!-- no translation found for storage_access (8905018810338984531) -->
     <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+    <!-- no translation found for keywords_storage_access (3708874088152933579) -->
     <skip />
 </resources>
diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml
index 2dd30af..db0bb5f 100644
--- a/res/values-ml/arrays.xml
+++ b/res/values-ml/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"മോശം"</item>
     <item msgid="2042505933058940139">"മോശം"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"60 ദിവസത്തിലധികം പഴയത്"</item>
     <item msgid="5692284879054004388">"90 ദിവസത്തിലധികം പഴയത്"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"നെറ്റ്‍വര്‍ക്ക് മുൻഗണന ഉപയോഗിക്കുക"</item>
+    <item msgid="8745603368609022803">"മീറ്റർ-മാപകമായി കണക്കാക്കുക"</item>
+    <item msgid="2266114985518865625">"മീറ്റർ മാപകമല്ലാത്തതായി കണക്കാക്കുക"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 9e76515..17273bc 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"നിങ്ങളുടെ ഉപകരണങ്ങൾ"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"പുതിയ ഉപകരണവുമായി ജോടിയാക്കുക"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"bluetooth ഉപകരണങ്ങളിലേക്ക് ജോടിയാക്കാനും കണക്‌റ്റ് ചെയ്യാനും ഉപകരണത്തെ അനുവദിക്കുക"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"ഇൻ-ബാൻഡ് റിംഗ് ചെയ്യൽ പ്രവർത്തനരഹിതമാക്കുക"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Bluetooth ഹെഡ്‌സെറ്റുകളിൽ ഇഷ്‌ടാനുസൃത ഫോൺ റിംഗ്‌ടോണുകൾ പ്ലേ ചെയ്യരുത്"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"നിലവിൽ കണക്റ്റ് ചെയ്തു"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"സംരക്ഷിച്ച ഉപകരണങ്ങൾ"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"ഉപകരണം ചേർക്കുക"</string>
@@ -330,6 +332,16 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"തീയതി സജ്ജീകരിക്കുക"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"അക്ഷരമാലക്രമത്തിൽ അടുക്കുക"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"സമയ മേഖലയനുസരിച്ച് അടുക്കുക"</string>
+    <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+    <skip />
+    <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+    <skip />
+    <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+    <skip />
     <string name="date_picker_title" msgid="1338210036394128512">"തീയതി"</string>
     <string name="time_picker_title" msgid="483460752287255019">"സമയം"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"സ്വമേധയാ ലോക്കുചെയ്യുക"</string>
@@ -348,6 +360,8 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"പ്രൊഫൈൽ വിവരം"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"അക്കൗണ്ടുകൾ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ലൊക്കേഷൻ"</string>
+    <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+    <skip />
     <string name="account_settings_title" msgid="626177544686329806">"അക്കൗണ്ടുകൾ"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"സുരക്ഷയും ലൊക്കേഷനും"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"എൻക്രിപ്‌ഷനും ക്രെഡന്‍ഷ്യലുകളും"</string>
@@ -691,6 +705,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"സ്‌പീക്കർ ഫോണായി"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"സംഗീതം, മീഡിയ എന്നിവയ്‌ക്കായി"</string>
     <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="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>
@@ -705,6 +721,8 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"പേര്"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+    <skip />
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"വൈഫൈ ഓഫാക്കാൻ <xliff:g id="REQUESTER">%s</xliff:g> താൽപ്പര്യപ്പെടുന്നു"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"വൈഫൈ ഓഫാക്കാൻ <xliff:g id="REQUESTER">%s</xliff:g> താൽപ്പര്യപ്പെടുന്നു"</string>
@@ -722,6 +740,8 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"വൈഫൈ"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"വൈഫൈ ഓണാക്കുക"</string>
     <string name="wifi_settings" msgid="29722149822540994">"വൈഫൈ"</string>
+    <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+    <skip />
     <string name="wifi_settings_category" msgid="8719175790520448014">"വൈഫൈ ക്രമീകരണങ്ങൾ"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"വൈഫൈ"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"വയർലെസ് ആക്‌സസ് പോയിന്റുകൾ സജ്ജീകരിക്കുക, നിയന്ത്രിക്കുക"</string>
@@ -833,7 +853,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ലഭ്യമാണ്)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"നിങ്ങളുടെ നെറ്റ്‌വർക്ക് പാസ്‌വേഡ് നൽകുക"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"കാരിയർ വൈഫൈ നെറ്റ്‌വർക്ക്"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> എന്നയാൾ വഴി കണക്‌റ്റുചെയ്യുക"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> എന്നയാൾ വഴി കണക്‌റ്റുചെയ്യുക"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ലൊക്കേഷൻ കൃത്യത മെച്ചപ്പെടുത്തുന്നതിനും മറ്റ് ആവശ്യകതകൾക്കായും, വൈഫൈ ഓഫായിരിക്കുമ്പോൾപ്പോലും നെറ്റ്‌വർക്ക് സ്‌കാൻ ചെയ്യാൻ <xliff:g id="APP_NAME">%1$s</xliff:g> താൽപ്പര്യപ്പെടുന്നു.\n\nസ്‌കാൻ ചെയ്യാൻ താൽപ്പര്യപ്പെടുന്ന എല്ലാ അപ്ലിക്കേഷനുകൾക്കായും ഇത് അനുവദിക്കണോ?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ഇത് ഓഫുചെയ്യുന്നതിന്, ഓവർഫ്ലോ മെനുവിലെ വിപുലമായത് എന്നതിലേക്ക് പോകുക."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"അനുവദിക്കുക"</string>
@@ -909,10 +929,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP ബാൻഡ്"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"നിങ്ങളുടെ മറ്റ് ഉപകരണങ്ങൾക്കായി ഒരു വൈഫൈ നെറ്റ്‌വർക്ക് സൃഷ്ടിക്കുന്നതിന് ഹോട്ട്‌സ്പോട്ട് ഉപയോഗിക്കുക. ഹോട്ട്‌സ്പോട്ട് ഇന്‍റർനെറ്റ് നൽകുന്നത് നിങ്ങളുടെ മൊബൈൽ ഡാറ്റാ കണക്ഷൻ ഉപയോഗിച്ചുകൊണ്ടാണ്. അധിക മൊബൈൽ ഡാറ്റാ നിരക്കുകൾ ബാധകമായേക്കാം."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ചുറ്റുവട്ടത്തുള്ള ഉപകരണങ്ങളുമായി ഉള്ളടക്കം പങ്കിടുന്നതിന് ആപ്പുകൾക്ക് ഹോട്ട്‌സ്പോട്ട് സൃഷ്ടിക്കാൻ കഴിയും."</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"ഹോട്ട്‌സ്‌പോട്ട് സ്വമേധയാ ഓഫാക്കുക"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"ഉപകരണങ്ങളൊന്നും കണക്‌റ്റ് ചെയ്‌തില്ലെങ്കിൽ വൈഫൈ ഹോട്ട്‌സ്‌പോട്ട് ഓഫാക്കപ്പെടും"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"ഹോട്ട്‌സ്പോട്ട് ഓണാക്കുന്നു…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"ഹോട്ട്‌സ്പോട്ട് ഓഫാക്കുന്നു…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> സജീവമാണ്"</string>
@@ -961,6 +979,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"അടിയന്തര വിലാസം"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"വൈഫൈ ഉപയോഗിച്ച് നിങ്ങളൊരു അടിയന്തര കോൾ ചെയ്യുമ്പോൾ, നിങ്ങളുടെ ലൊക്കേഷനായി ഉപയോഗിക്കപ്പെടും"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958">"സ്വകാര്യ DNS ഫീച്ചറുകളെ കുറിച്ച് "<annotation id="url">"കൂടുതലറിയുക"</annotation></string>
     <string name="display_settings_title" msgid="1708697328627382561">"ഡിസ്പ്ലേ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ശബ്‌ദം"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"വോളിയം"</string>
@@ -1308,6 +1327,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"നിങ്ങളുടെ പുതിയ <xliff:g id="NAME">^1</xliff:g> പ്രവർത്തിക്കുന്നു. \n\nഫോട്ടോകൾ, ഫയലുകൾ അപ്ലിക്കേഷൻ വിവരം എന്നിവ ഈ ഉപകരണത്തിലേക്ക് നീക്കാൻ, ക്രമീകരണം &gt; സ്റ്റോറേജ്  എന്നതിലേക്ക് പോകുക."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> നീക്കുക"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="NAME_0">^2</xliff:g> എന്നതിലേക്ക് <xliff:g id="APP">^1</xliff:g> എന്നതും അതിന്റെ വിവരവും നീക്കുന്നതിന് കുറച്ച് നിമിഷങ്ങൾ മാത്രമേയെടുക്കൂ. നീക്കുന്ന പ്രവർത്തനം പൂർത്തിയാകുന്നതുവരെ നിങ്ങൾക്ക് അപ്ലിക്കേഷൻ ഉപയോഗിക്കാനാവില്ല. \n\nനീക്കുന്നതിനിടെ <xliff:g id="NAME_1">^2</xliff:g> നീക്കംചെയ്യരുത്."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"ഡാറ്റ നീക്കാൻ <xliff:g id="APP">^1</xliff:g> ഉപയോക്താവിനെ അൺലോക്ക് ചെയ്യേണ്ടതുണ്ട്."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> നീക്കുന്നു…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"നീക്കുന്നതിനിടെ <xliff:g id="NAME">^1</xliff:g> നീക്കംചെയ്യരുത്. \n\nനീക്കുന്ന പ്രവർത്തനം പൂർത്തിയാകുന്നതുവരെ ഈ ഉപകരണത്തിലെ <xliff:g id="APP">^2</xliff:g> അപ്ലിക്കേഷൻ ലഭ്യമാകില്ല."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"നീക്കുന്നത് റദ്ദാക്കുക"</string>
@@ -1468,6 +1488,8 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"ലൊക്കേഷൻ ഉറവിടങ്ങൾ"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"ടാബ്‌ലെ‌റ്റിന് ഒരാമുഖം"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"ഫോണിന് ഒരാമുഖം"</string>
+    <!-- no translation found for about_settings (6717640957897546887) -->
+    <skip />
     <string name="about_settings" product="emulator" msgid="221313099578564438">"എമുലേറ്റഡ് ഉപകരണത്തെ കുറിച്ച്"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"നിയമ വിവരം, നില, സോഫ്‌റ്റ്‌വെയർ പതിപ്പ് എന്നിവ കാണുക"</string>
     <string name="legal_information" msgid="5769301644270604095">"നിയമപരമായ വിവരം"</string>
@@ -1575,6 +1597,8 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"എല്ലാ <xliff:g id="COUNT">%1$d</xliff:g> ആപ്പുകളും കാണൂ"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"തിരിച്ചറിയാനാകാത്ത ആപ്‌സിനാൽ നിങ്ങളുടെ ടാബ്‌ലെറ്റും വ്യക്തിഗത ഡാറ്റയും ആക്രമിക്കപ്പെടാനുള്ള സാധ്യത വളരെ കൂടുതലാണ്. ഈ ഉറവിടത്തിൽ നിന്ന് ആപ്‌സ് ഇൻസ്റ്റാൾ ചെയ്യുന്നതിലൂടെ, ഈ ആപ്‌സ് ഉപയോഗിക്കുന്നതിനാൽ നിങ്ങളുടെ ടാബ്‌ലെറ്റിന് സംഭവിച്ചേക്കാവുന്ന എല്ലാ നാശനഷ്‌ടങ്ങൾക്കും അല്ലെങ്കിൽ ഡാറ്റാ നഷ്‌ടങ്ങൾക്കും നിങ്ങൾക്കാണ് ഉത്തരവാദിത്തമെന്ന് നിങ്ങൾ അംഗീകരിക്കുന്നു."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"തിരിച്ചറിയാനാകാത്ത ആപ്‌സിനാൽ നിങ്ങളുടെ ഫോണും വ്യക്തിഗത ഡാറ്റയും ആക്രമിക്കപ്പെടാനുള്ള സാധ്യത വളരെ കൂടുതലാണ്. ഈ ഉറവിടത്തിൽ നിന്ന് ആപ്‌സ് ഇൻസ്റ്റാൾ ചെയ്യുന്നതിലൂടെ, ഈ ആപ്‌സ് ഉപയോഗിക്കുന്നതിനാൽ നിങ്ങളുടെ ഫോണിന് സംഭവിച്ചേക്കാവുന്ന എല്ലാ നാശനഷ്‌ടങ്ങൾക്കും അല്ലെങ്കിൽ ഡാറ്റാ നഷ്‌ടങ്ങൾക്കും നിങ്ങൾക്കാണ് ഉത്തരവാദിത്തമെന്ന് നിങ്ങൾ അംഗീകരിക്കുന്നു."</string>
+    <!-- no translation found for install_all_warning (3648003301476423145) -->
+    <skip />
     <string name="advanced_settings" msgid="1777249286757067969">"വിപുലമായ ക്രമീകരണം"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"കൂടുതൽ ക്രമീകരണ ഓപ്‌ഷനുകൾ പ്രവർത്തനക്ഷമമാക്കുക"</string>
     <string name="application_info_label" msgid="5736524913065714880">"ആപ്പ് വിവരം"</string>
@@ -1874,6 +1898,12 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"പ്രകടനത്തെ ബാധിച്ചേക്കാം"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"പോയിന്റർനിന്നശേഷം ക്ലിക്കുചെയ്യൂ"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ക്ലിക്കിന് മുമ്പുള്ള കാലതാമസം"</string>
+    <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+    <skip />
+    <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+    <skip />
+    <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+    <skip />
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ഓൺ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ഓഫ്"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"ദ്രുത്ര ക്രമീകരണങ്ങളിൽ ദൃശ്യമാക്കുക"</string>
@@ -2030,14 +2060,37 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"പശ്ചാത്തലത്തിൽ ഉപകരണം സജീവമാക്കുന്നു"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"ലൊക്കേഷൻ കൂടെക്കൂടെ അഭ്യർത്ഥിക്കുന്നു"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ആപ്പുകൾ അസ്വാഭാവികമായി പ്രവർത്തിക്കുന്നു"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"ബാറ്ററിക്ക് പ്രശ്‌നങ്ങളൊന്നുമില്ല"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"ആപ്പുകൾ സാധാരണ രീതിയിൽ പ്രവർത്തിക്കുന്നു"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"കുറഞ്ഞ ബാറ്ററി ശേഷി"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"ബാറ്ററിക്ക് മികച്ച ബാറ്ററി ലൈഫ് നൽകാനാവുന്നില്ല"</string>
+    <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+    <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"ഫോൺ വൻതോതിൽ ഉപയോഗിച്ചു"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"ടാബ്‌ലെറ്റ് വൻതോതിൽ ഉപയോഗിച്ചു"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"ഉപകരണം വൻതോതിൽ ഉപയോഗിച്ചു"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"അവസാനം പൂർണ്ണമായി ചാർജായ ശേഷം ഏകദേശം <xliff:g id="HOUR">%1$s</xliff:g> ഉപയോഗിച്ചു"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"ഫോൺ വൻതോതിൽ ഉപയോഗിച്ചതിനാൽ വളരെയധികം ബാറ്ററി ചാർജ് ഉപയോഗിക്കപ്പെട്ടു. ബാറ്ററി സാധാരണ രീതിയിൽ പ്രവർത്തിക്കുന്നു.\n\n അവസാനം പൂർണ്ണമായി ചാർജായ ശേഷം ഏകദേശം <xliff:g id="HOUR">%1$s</xliff:g> ഫോൺ ഉപയോഗിച്ചു.\n\n ആകെ ഉപയോഗം:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"ടാബ്‌ലെറ്റ് വൻതോതിൽ ഉപയോഗിച്ചതിനാൽ വളരെയധികം ബാറ്ററി ചാർജ് ഉപയോഗിക്കപ്പെട്ടു. ബാറ്ററി സാധാരണ രീതിയിൽ പ്രവർത്തിക്കുന്നു.\n\n അവസാനം പൂർണ്ണമായി ചാർജായ ശേഷം ഏകദേശം <xliff:g id="HOUR">%1$s</xliff:g> ടാബ്‌ലെറ്റ് ഉപയോഗിച്ചു.\n\n ആകെ ഉപയോഗം:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"ഉപകരണം വൻതോതിൽ ഉപയോഗിച്ചതിനാൽ വളരെയധികം ബാറ്ററി ചാർജ് ഉപയോഗിക്കപ്പെട്ടു. ബാറ്ററി സാധാരണ രീതിയിൽ പ്രവർത്തിക്കുന്നു.\n\n അവസാനം പൂർണ്ണമായി ചാർജായ ശേഷം ഏകദേശം <xliff:g id="HOUR">%1$s</xliff:g> ഉപകരണം ഉപയോഗിച്ചു.\n\n ആകെ ഉപയോഗം:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"സ്മാർട്ട് ബാറ്ററി മാനേജർ"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"ബാറ്ററി സ്വമേധയാ മാനേജ് ചെയ്യുക"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"ഉപയോഗത്തിന് അനുസൃതമായി, ആപ്പുകൾ പവർ ഉപയോഗം സ്വമേധയാ ക്രമീകരിക്കുന്നു"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"നിയന്ത്രിത ആപ്പുകൾ"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="other">%1$d ആപ്പുകൾ</item>
+      <item quantity="one">%1$d ആപ്പ്</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"ആപ്പ് നിർത്തണോ?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"നിങ്ങളുടെ ഫോണിനെ <xliff:g id="APP">%1$s</xliff:g> സജീവമാക്കി നിലനിർത്തുന്നതിനാൽ ഫോണിന് സാധാരണ ഗതിയിൽ ബാറ്ററി മാനേജുചെയ്യാൻ കഴിയില്ല.\n\nഈ പ്രശ്‌നം പരിഹരിക്കാൻ ശ്രമിക്കുന്നതിന്, ഈ ആപ്പിന്റെ പ്രവർത്തനം നിർത്തുക.\n\nപ്രശ്‌നം നിലനിൽക്കുകയാണെങ്കിൽ, ബാറ്ററി പ്രകടനം മെച്ചപ്പെടുത്തുന്നതിന് നിങ്ങൾക്ക് ഈ ആപ്പ് അൺ‌ഇൻസ്‌റ്റാൾ ചെയ്യേണ്ടി വന്നേക്കാം."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"നിങ്ങളുടെ ടാബ്‌ലെറ്റിനെ <xliff:g id="APP">%1$s</xliff:g> സജീവമാക്കി നിലനിർത്തുന്നതിനാൽ ടാബ്‌ലെറ്റിന് സാധാരണ ഗതിയിൽ ബാറ്ററി മാനേജുചെയ്യാൻ കഴിയില്ല.\n\nഈ പ്രശ്‌നം പരിഹരിക്കാൻ ശ്രമിക്കുന്നതിന്, ഈ ആപ്പിന്റെ പ്രവർത്തനം നിർത്തുക.\n\nപ്രശ്‌നം നിലനിൽക്കുകയാണെങ്കിൽ, ബാറ്ററി പ്രകടനം മെച്ചപ്പെടുത്തുന്നതിന് നിങ്ങൾക്ക് ഈ ആപ്പ് അൺ‌ഇൻസ്‌റ്റാൾ ചെയ്യേണ്ടി വന്നേക്കാം."</string>
@@ -2146,6 +2199,8 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"മീഡിയ സെർവർ"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"ആപ്പ് ഓപ്റ്റിമൈസേഷന്‍"</string>
     <string name="battery_saver" msgid="8172485772238572153">"ബാറ്ററി ലാഭിക്കൽ"</string>
+    <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+    <skip />
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"ഓട്ടോമാറ്റിക്കായി ഓണാക്കുക"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"ഒരിക്കലും"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> ബാറ്ററിയിൽ"</string>
@@ -2366,6 +2421,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"അക്കൗണ്ട് നീക്കംചെയ്യണോ?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"ഈ അക്കൗണ്ട് നീക്കംചെയ്യുന്നത്, അതിന്റെ എല്ലാ സന്ദേശങ്ങളും കോൺടാക്റ്റുകളും മറ്റ് ഡാറ്റയും ടാബ്‌ലെറ്റിൽ നിന്ന് ഇല്ലാതാക്കുന്നതിനിടയാക്കും!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"ഈ അക്കൗണ്ട് നീക്കംചെയ്യുന്നതിലൂടെ, അതിലെ എല്ലാ സന്ദേശങ്ങളും കോൺടാക്റ്റുകളും മറ്റ് ഡാറ്റയും ഫോണിൽ നിന്ന് ഇല്ലാതാക്കപ്പെടും!"</string>
+    <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+    <skip />
     <string name="remove_account_failed" msgid="3901397272647112455">"ഈ മാറ്റം നിങ്ങളുടെ അഡ്‌മിൻ അനുവദിച്ചതല്ല"</string>
     <string name="provider_label" msgid="7724593781904508866">"പുഷ് സബ്സ്ക്രിപ്‌ഷനുകൾ"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2890,8 +2947,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"ദൃശ്യതടസങ്ങൾ ബ്ലോക്കുചെയ്യൂ"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"ദൃശ്യ സിഗ്നലുകൾ അനുവദിക്കുക"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"ചേർക്കുക"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ഇപ്പോൾ ഓണാക്കുക"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"ഇപ്പോൾ ഓഫ് ചെയ്യുക"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"ഇപ്പോൾ ഓണാക്കുക"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"ഇപ്പോൾ ഓഫ് ചെയ്യുക"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> വരെ \'ശല്യപ്പെടുത്തരുത്\' ഓണാണ്"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"നിങ്ങൾ ഓഫാക്കുന്നത് വരെ \'ശല്യപ്പെടുത്തരുത്\' ഓണായി തുടരും"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"ഒരു നയം (<xliff:g id="RULE_NAME">%s</xliff:g>) സ്വമേധയാ \'ശല്യപ്പെടുത്തരുത്\' ഓണാക്കി"</string>
@@ -2930,7 +2987,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"ആപ്പ് അറിയിപ്പുകൾ"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"അറിയിപ്പ് വിഭാഗം"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"അറിയിപ്പ് വിഭാഗ ഗ്രൂപ്പ്"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"പ്രാധാന്യം"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"പ്രവർത്തനരീതി"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"ശ‌ബ്‌ദം അനുവദിക്കുക"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"അറിയിപ്പുകൾ ഒരിക്കലും കാണിക്കരുത്"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ശബ്ദപരമോ ദൃശ്യപരമോ ആയ തടസ്സമില്ല"</string>
@@ -2948,6 +3005,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"ഇടത്തരം പ്രാധാന്യം"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"ഉയർന്ന പ്രാധാന്യം"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"അടിയന്തര പ്രാധാന്യം"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"അറിയിപ്പുകൾ കാണിക്കുക"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"അറിയിപ്പ് സഹായി"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"അറിയിപ്പ് ആക്സസ്സ്"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"ഔദ്യോഗിക പ്രൊഫൈൽ അറിയിപ്പുകളിലേക്കുള്ള ആക്‌സസ്സ് ബ്ലോക്കുചെയ്‌തു"</string>
@@ -2978,9 +3036,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"\'ശല്യപ്പെടുത്തരുത്\' ആക്‌സസ്സ്"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ഇൻസ്റ്റാളുചെയ്‌തവയൊന്നും \'ശല്യപ്പെടുത്തരുത്\' മോഡിൽ പ്രവേശിക്കാൻ അഭ്യർത്ഥിച്ചിട്ടില്ല"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"അപ്ലിക്കേഷനുകൾ ലോഡുചെയ്യുന്നു..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"ഈ ആപ്പിന്‍റെ അറിയിപ്പുകൾ ഉപകരണത്തില്‍ ദൃശ്യമാകുന്നത് Android തടസ്സപ്പെടുത്തുന്നു"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"ഈ ഉപകരണത്തിൽ ഈ വിഭാഗത്തിൽ പെട്ട അറിയിപ്പുകൾ ദൃശ്യമാകുന്നത് Android ബ്ലോക്കുചെയ്യുന്നു"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"ഈ ഗ്രൂപ്പിൽ പെട്ട അറിയിപ്പുകൾ ഈ ഉപകരണത്തിൽ ദൃശ്യമാകുന്നത് Android ബ്ലോക്ക് ചെയ്യുന്നു"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"നിങ്ങളുടെ അഭ്യർത്ഥനപ്രകാരം, ഈ ഉപകരണത്തിൽ ഈ ആപ്പിന്‍റെ അറിയിപ്പുകൾ ദൃശ്യമാകുന്നത് Android ബ്ലോക്ക് ചെയ്യുന്നു"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"നിങ്ങളുടെ അഭ്യർത്ഥനപ്രകാരം, ഈ ഉപകരണത്തിൽ ഈ വിഭാഗത്തിൽപ്പെട്ട അറിയിപ്പുകൾ ദൃശ്യമാകുന്നത് Android ബ്ലോക്ക് ചെയ്യുന്നു"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"നിങ്ങളുടെ അഭ്യർത്ഥനപ്രകാരം, ഈ ഗ്രൂപ്പിൽപ്പെട്ട അറിയിപ്പുകൾ ഈ ഉപകരണത്തിൽ ദൃശ്യമാകുന്നത് Android ബ്ലോക്ക് ചെയ്യുന്നു"</string>
     <string name="notification_channels" msgid="5346841743182627500">"വിഭാഗങ്ങള്‍"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"മറ്റുള്ളവ"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3559,31 +3617,10 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"ഒന്നിലധികം ഉപകരണങ്ങളിൽ കണക്‌റ്റുചെയ്‌തു"</string>
     <string name="demo_mode" msgid="2798762752209330277">"സിസ്റ്റം UI ഡെമോ മോഡ്"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"ദ്രുത ‌ക്രമീകരണ ഡെവലപ്പർ ടൈലുകൾ"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"സഹായിക്കാൻ ഞങ്ങൾ ഇവിടെയുണ്ട്"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"നിങ്ങൾക്ക് 24/7 സഹായം നൽകാൻ ഞങ്ങളുണ്ട്"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"നിങ്ങൾക്ക് 24/7 സഹായം നൽകാൻ ഞങ്ങളുണ്ട്"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"ഏത് പ്രശ്നവും പരിഹരിക്കുന്നതിന് ഞങ്ങളുടെ പിന്തുണ ടീമിന്റെ സഹായം ലഭിക്കും"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"ദിവസം മുഴുവനും എല്ലാ സമയവും ഞങ്ങളുടെ പിന്തുണ ടീം സഹായത്തിനുണ്ട്"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"സഹായം തിരയുക അല്ലെങ്കിൽ പിന്തുണ സമയ (പ്രാദേശിക സമയം) വേളയിൽ തിരികെ വരിക:&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"ഫോൺ പിന്തുണ സമയം (പ്രാദേശിക സമയം)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"സഹായം തിരയുക അല്ലെങ്കിൽ നുറുങ്ങുവിവരങ്ങളും പൊടിക്കൈകളും അടുത്തറിയുക"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"ഇതിനായുള്ള പിന്തുണ:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"വിദേശത്തേക്ക് യാത്ര ചെയ്യുകയാണോ?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"അന്താരാഷ്ട്ര നിരക്കുകൾ ബാധകമായേക്കാം"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"ഫോൺ"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"ചാറ്റുചെയ്യുക"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"നുറുങ്ങുവിവരങ്ങളും പൊടിക്കൈകളും അടുത്തറിയുക"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"സഹായം തിരയുക, ഫീഡ്‌ബാക്ക് അയയ്ക്കുക"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"പിന്തുണാവിഭാഗത്തെ ബന്ധപ്പെടുക"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"സൈൻ ഇൻ ചെയ്യുക"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"സൈൻ ഇൻ ചെയ്യാൻ കഴിയുന്നില്ലേ?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"സിസ്റ്റം വിവരങ്ങൾ അയയ്ക്കുക"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"വീണ്ടും കാണിക്കരുത്"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"ഇനിപ്പറയുന്നതായി അഭ്യർത്ഥിക്കുന്നു"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"അക്കൗണ്ട് ചേർക്കുക"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"സിസ്റ്റം വിവരങ്ങൾ"</string>
+    <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+    <skip />
+    <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+    <skip />
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"ഔദ്യോഗിക പ്രൊഫൈൽ ക്രമീകരണം"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"കോൺടാക്റ്റ് തിരയൽ"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"വിളിക്കുന്നവരെയും കോൺടാക്റ്റുകളെയും തിരിച്ചറിയുന്നതിന് കോൺടാക്റ്റുകൾ തിരയാൻ നിങ്ങളുടെ സ്ഥാപനത്തെ അനുവദിക്കുക"</string>
@@ -3599,11 +3636,12 @@
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> സെക്കൻഡ്</item>
       <item quantity="one">ഒരു സെക്കൻഡ്</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> കാക്കുക"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"സ്റ്റോറേജ്  നിയന്ത്രിക്കുക"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"സ്റ്റോറേജ് ഇടം സൃഷ്ടിക്കുന്നതിന്, ബാക്കപ്പെടുത്ത ഫോട്ടോകളും വീഡിയോകളും നിങ്ങളുടെ ഉപകരണത്തിൽ നിന്ന് സ്റ്റോറേജ് മാനേജർ നീക്കംചെയ്യുന്നു."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ഫോട്ടോകളും വീഡിയോകളും നീക്കംചെയ്യുക"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"സ്റ്റോറേജ് മാനേജർ"</string>
+    <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+    <skip />
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"സ്വയമേവ"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"മാനുവൽ"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"ഇപ്പോൾ ഇടം സൃഷ്ടിക്കുക"</string>
@@ -3769,8 +3807,10 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"നിങ്ങളുടെ ‌പുതിയ ‌ടാബ്‌ലെറ്റിനെ അറിയുക‌"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"നിങ്ങളുടെ പുതിയ ഉപകരണത്തെ അറിയുക"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ഈ ഫീച്ചർ ഈ ഉപകരണത്തിൽ ലഭ്യമല്ല"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"പൂർണ്ണ GNSS അളവുകൾ നടപ്പിലാക്കുക"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"നോ ഡ്യൂട്ടി സൈക്ലിംഗ് ഉപയോഗിച്ച് മുഴുവൻ GNSS കോൺസ്‌റ്റലേഷനുകളും ആവൃത്തികളും ട്രാക്ക് ചെയ്യൂ"</string>
+    <!-- no translation found for storage_access (8905018810338984531) -->
     <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+    <!-- no translation found for keywords_storage_access (3708874088152933579) -->
     <skip />
 </resources>
diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml
index ac70b05..b51e995 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"खराब"</item>
     <item msgid="2042505933058940139">"खराब"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"60 दिवसांपेक्षा अधिक जुने"</item>
     <item msgid="5692284879054004388">"90 दिवसांपेक्षा अधिक जुने"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"नेटवर्क प्राधान्य वापरा"</item>
+    <item msgid="8745603368609022803">"मीटरने मोजले जात असल्याचे धरा"</item>
+    <item msgid="2266114985518865625">"मीटरने मोजले जात नसल्याचे धरा"</item>
+  </string-array>
 </resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index ed79038..4fd192b 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"तुमचे डिव्हाइस"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"नवीन डिव्हाइस जोडा"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"डिव्हाइसला ब्लुटूथ डिव्हाइससोबत पेअर आणि कनेक्ट होऊ द्या"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"इनबॅंड रिंग होणे बंद करा"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"ब्लूटूथ हेडसेटवर कस्टम फोन रिंगटोन प्ले करू नका"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"सध्या कनेक्ट केले आहे"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"सेव्ह केलेली डिव्हाइस"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"डिव्हाइस जोडा"</string>
@@ -202,7 +204,7 @@
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"सेल स्थान माहिती (बहिष्कृत):"</string>
     <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"शेजारील सेल माहिती (बहिष्कृत):"</string>
-    <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"सेल माहिती रीफ्रेश रेट:"</string>
+    <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"सेल माहिती रिफ्रेश रेट:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"सर्व सेल परिमाण माहिती:"</string>
     <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"डेटा कनेक्शन रीअल-टाइम माहिती:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"डेटा सेवा:"</string>
@@ -228,7 +230,7 @@
     <string name="ping_test_label" msgid="579228584343892613">"पिंग चाचणी चालवा"</string>
     <string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
     <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"अपडेट करा"</string>
-    <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"रीफ्रेश करा"</string>
+    <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"रिफ्रेश करा"</string>
     <string name="radio_info_toggle_dns_check_label" msgid="6625185764803245075">"DNS तपासणी टॉगल करा"</string>
     <string name="oem_radio_info_label" msgid="6163141792477958941">"OEM-विशिष्ट माहिती/सेटिंग्ज"</string>
     <string name="band_mode_title" msgid="4071411679019296568">"रेडिओ बॅण्ड मोड सेट करा"</string>
@@ -330,6 +332,16 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"तारीख सेट करा"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"अक्षरानुक्रमे क्रमवारी लावा"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"टाइम झोन नुसार क्रमवारी लावा"</string>
+    <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+    <skip />
+    <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+    <skip />
+    <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+    <skip />
     <string name="date_picker_title" msgid="1338210036394128512">"तारीख"</string>
     <string name="time_picker_title" msgid="483460752287255019">"वेळ"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"स्वयंचलितपणे लॉक करा"</string>
@@ -348,6 +360,8 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"प्रोफाईल माहिती"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"खाती"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"स्थान"</string>
+    <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+    <skip />
     <string name="account_settings_title" msgid="626177544686329806">"खाती"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"सुरक्षितता आणि स्थान"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"एंक्रिप्शन आणि क्रेडेंशियल"</string>
@@ -638,7 +652,7 @@
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
     <string name="bluetooth_connecting_error_message" msgid="1397388344342081090">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> सह कनेक्ट करणे शक्य झाले नाही."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"डिव्हाइसेससाठी स्कॅन करा"</string>
-    <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"रीफ्रेश करा"</string>
+    <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"रिफ्रेश करा"</string>
     <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"शोधत आहे..."</string>
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"डिव्हाइस सेटिंग्ज"</string>
     <string name="bluetooth_preference_paired_dialog_title" msgid="8875124878198774180">"पेअर केलेले डिव्हाइस"</string>
@@ -691,6 +705,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"स्पीकर फोन म्हणून"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"संगीत आणि मीडियासाठी"</string>
     <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="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>
@@ -705,6 +721,8 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"नाव"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+    <skip />
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> वाय-फाय चालू करू इच्छित आहे"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> वाय-फाय बंद करू इच्छित आहे"</string>
@@ -722,6 +740,8 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"वाय-फाय"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"वाय-फाय चालू करा"</string>
     <string name="wifi_settings" msgid="29722149822540994">"वाय-फाय"</string>
+    <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+    <skip />
     <string name="wifi_settings_category" msgid="8719175790520448014">"वाय-फाय सेटिंग्ज"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"वाय-फाय"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"वायरलेस प्रवेश बिंदू सेट करा आणि  व्यवस्थापित करा"</string>
@@ -833,7 +853,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS उपलब्ध)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"आपला नेटवर्क पासवर्ड एंटर करा"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"वाहक वाय-फाय नेटवर्क"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> ने कनेक्ट करा"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> ने कनेक्ट करा"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"स्थान अचूकता सुधारण्यासाठी आणि इतर हेतूंसाठी, <xliff:g id="APP_NAME">%1$s</xliff:g> ला नेटवर्क स्कॅनिंग चालू करण्याची आवश्यकता आहे, वाय-फाय बंद असताना देखील.\n\nस्कॅन करू इच्छित सर्व अॅप्सना अनुमती द्यायची?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"हे बंद करण्यासाठी, ओव्हरफ्लो मेनू मधील प्रगत वर जा."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"अनुमती द्या"</string>
@@ -909,10 +929,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP Band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"तुमच्या इतर डिव्हाइससाठी वाय-फाय नेटवर्क तयार करण्यासाठी हॉटस्पॉटचा वापर करा. हॉटस्पॉट तुमचे मोबाइल डेटा कनेक्शन वापरून इंटरनेट पुरवते. अतिरिक्त मोबाइल डेटा शुल्क लागू शकते."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"जवळपासच्या डिव्हाइससोबत आशय शेअर करण्यासाठी अ‍ॅप्स हॉटस्पॉट तयार करू शकतात."</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"हॉटस्पॉट आपोआप बंद करा"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"कुठलीही डिव्हाइस कनेक्ट केली नसल्यास, वाय-फाय हॉटस्पॉट बंद होईल"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"हॉटस्पॉट चालू करत आहे…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"हॉटस्पॉट बंद करत आहे…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> सक्रिय आहे"</string>
@@ -961,6 +979,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"संकटकालीन पत्ता"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"तुम्ही Wi-Fi वरून आणीबाणी कॉल केल्यावर हे तुमचे स्थान असल्याचे दाखवले जाते"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958">"खाजगी DNS वैशिष्ट्यांबद्दल "<annotation id="url">"अधिक जाणून घ्या"</annotation></string>
     <string name="display_settings_title" msgid="1708697328627382561">"डिस्प्ले"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ध्वनी"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"आवाज"</string>
@@ -1308,6 +1327,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"आपले नवीन <xliff:g id="NAME">^1</xliff:g> कार्य करत आहे. \n\nया डिव्‍हाइसवर फोटो, फायली आणि अ‍ॅप डेटा हलविण्‍यासाठी, सेटिंग्ज &gt; संचयनावर जा."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> हलवा"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> आणि त्याचा डेटा <xliff:g id="NAME_0">^2</xliff:g> वर हलविण्‍यास केवळ काही क्षण लागतील. हलविणे पूर्ण होईपर्यंत आपण अ‍ॅप वापरण्‍यास सक्षम असणार नाहीत. \n\nहलविण्‍यादरम्यान <xliff:g id="NAME_1">^2</xliff:g> काढू नका."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"डेटा हलवण्यासाठी तुम्हाला <xliff:g id="APP">^1</xliff:g> या वापरकर्त्याला अनलॉक करावे लागेल."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> हलवित आहे…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"हलविण्‍यादरम्यान <xliff:g id="NAME">^1</xliff:g> काढू नका. \n\nहलविणे पूर्ण होईपर्यंत या डिव्‍हाइसवरील <xliff:g id="APP">^2</xliff:g> अ‍ॅप उपलब्‍ध नसेल."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"हलविणे रद्द करा"</string>
@@ -1468,6 +1488,8 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"स्थान स्रोत"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"टॅबलेट विषयी"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"फोन विषयी"</string>
+    <!-- no translation found for about_settings (6717640957897546887) -->
+    <skip />
     <string name="about_settings" product="emulator" msgid="221313099578564438">"अनुकरण केलेल्या डिव्हाइसबद्दल"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"कायदेशीर माहिती, स्थिती, सॉफ्टवेअर आवृत्ती पहा"</string>
     <string name="legal_information" msgid="5769301644270604095">"कायदेशीर माहिती"</string>
@@ -1575,6 +1597,8 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"सगळे <xliff:g id="COUNT">%1$d</xliff:g> अ‍ॅप्स पहा"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"आपले टॅबलेट आणि वैयक्तिक डेटा अज्ञात अनुप्रयोगांद्वारे आक्रमणांपासून अधिक असुरक्षित असतात. या स्रोताकडील अ‍ॅप्स इंस्टॉल करून, आपण सहमत आहात की त्यांच्या वापराच्या परिणामी होणार्‍या आपल्या टॅबलेटच्या कोणत्याही नुकसानासाठी किंवा डेटाच्या हानीसाठी आपण जबाबदार आहात."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"आपला फोन आणि वैयक्तिक डेटा अज्ञात अनुप्रयोगांद्वारे आक्रमणांपासून अधिक असुरक्षित असतात. या स्रोताकडील अ‍ॅप्स इंस्टॉल करून, आपण सहमत आहात की त्यांच्या वापराच्या परिणामी होणार्‍या आपल्या फोनच्या कोणत्याही नुकसानासाठी किंवा डेटाच्या हानीसाठी आपण जबाबदार आहात."</string>
+    <!-- no translation found for install_all_warning (3648003301476423145) -->
+    <skip />
     <string name="advanced_settings" msgid="1777249286757067969">"प्रगत सेटिंग्ज"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"अधिक सेटिंग्ज पर्याय सक्षम करा"</string>
     <string name="application_info_label" msgid="5736524913065714880">"अॅप माहिती"</string>
@@ -1874,6 +1898,12 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"कार्यप्रदर्शन प्रभावित करू शकते"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"पॉइंटर हलविणे थांबविल्यानंतर क्लिक करा"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"क्लिक करण्यापूर्वी विलंब करा"</string>
+    <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+    <skip />
+    <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+    <skip />
+    <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+    <skip />
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"चालू"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"बंद"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"द्रुत सेटिंग्जमध्ये दर्शवा"</string>
@@ -1947,17 +1977,17 @@
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"कोणतीही सेवा निवडलेली नाही"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"वर्णन प्रदान केले नाही."</string>
     <string name="settings_button" msgid="3006713718908152930">"सेटिंग्ज"</string>
-    <string name="print_settings" msgid="4742428530112487843">"मुद्रण"</string>
+    <string name="print_settings" msgid="4742428530112487843">"प्रिंट"</string>
     <string name="print_settings_summary_no_service" msgid="6354322414246865875">"बंद"</string>
     <plurals name="print_settings_summary" formatted="false" msgid="6005468025646083029">
-      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> मुद्रण सेवा चालू</item>
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> मुद्रण सेवा चालू</item>
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> प्रिंट सेवा चालू</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> प्रिंट सेवा चालू</item>
     </plurals>
     <plurals name="print_jobs_summary" formatted="false" msgid="5810106725778525400">
-      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> मुद्रण कार्य</item>
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> मुद्रण कार्ये</item>
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> प्रिंट कार्य</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> प्रिंट कार्ये</item>
     </plurals>
-    <string name="print_settings_title" msgid="3685449667822217816">"मुद्रण सेवा"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"प्रिंट सेवा"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"कोणत्याही सेवा इंस्टॉल केल्या नाहीत"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"कोणतेही प्रिंटर आढळले नाहीत"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"सेटिंग्ज"</string>
@@ -1969,12 +1999,12 @@
     <string name="print_menu_item_search" msgid="7025589328240514553">"शोध"</string>
     <string name="print_searching_for_printers" msgid="4680248496457576358">"प्रिंटर शोधत आहे"</string>
     <string name="print_service_disabled" msgid="7739452396114245222">"सेवा अक्षम केली"</string>
-    <string name="print_print_jobs" msgid="3582094777756968793">"मुद्रण कार्ये"</string>
-    <string name="print_print_job" msgid="7563741676053287211">"मुद्रण कार्य"</string>
+    <string name="print_print_jobs" msgid="3582094777756968793">"प्रिंट कार्ये"</string>
+    <string name="print_print_job" msgid="7563741676053287211">"प्रिंट कार्य"</string>
     <string name="print_restart" msgid="8373999687329384202">"रीस्टार्ट"</string>
     <string name="print_cancel" msgid="3621199386568672235">"रद्द करा"</string>
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
-    <string name="print_printing_state_title_template" msgid="5736107667714582025">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> मुद्रण करत आहे"</string>
+    <string name="print_printing_state_title_template" msgid="5736107667714582025">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> प्रिंट करत आहे"</string>
     <string name="print_cancelling_state_title_template" msgid="7102968925358219875">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> रद्द करत आहे"</string>
     <string name="print_failed_state_title_template" msgid="1436099128973357969">"प्रिंटर एरर <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_blocked_state_title_template" msgid="9065391617425962424">"प्रिंटरने <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> अवरोधित केले"</string>
@@ -2030,14 +2060,37 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"डिव्हाइसला बॅकग्राउंडमध्‍ये सक्रिय ठेवते"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"स्थानाशी संबंधित माहिती वारंवार मागत आहे"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> अ‍ॅप्स विचित्र प्रकारे काम करत आहेत"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"बॅटरी चांगल्या स्थितीत आहे"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"अ‍ॅप्स नेहमीसारखीच काम करत आहेत"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"बॅटरीची क्षमता कमी"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"बॅटरी लाइफ जास्त वेळ टिकण्यासारखी नाही"</string>
+    <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+    <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"फोनचा भरपूर वापर झाला"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"टॅबलेटचा भरपूर वापर झाला"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"डिव्हाइसचा भरपूर वापर झाला"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"पूर्ण चार्ज केल्यापासून साधारणपणे <xliff:g id="HOUR">%1$s</xliff:g> वापरला गेले"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"तुमच्या फोनचा भरपूर वापर करण्यात आल्यामुळे, बॅटरीचा वापरही मोठ्या प्रमाणात झाला. तुमची बॅटरी नेहमीसारखी काम करत आहे.\n\n तुमचा फोन पूर्ण चार्ज केल्यापासून <xliff:g id="HOUR">%1$s</xliff:g> तास वापरला गेला आहे.\n\n एकूण वापर:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"तुमच्या टॅबलेटचा भरपूर वापर झाल्यामुळे, बॅटरीचा वापरसुद्धा मोठ्या प्रमाणात झाला. तुमची बॅटरी नेहमीसारखी काम करत आहे.\n\n तुमचा टॅबलेट पूर्ण चार्ज केल्यापासून <xliff:g id="HOUR">%1$s</xliff:g> तास वापरला गेला आहे.\n\n एकूण वापर:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"तुमच्या डिव्हाइसचा भरपूर वापर करण्यात आल्यामुळे, बॅटरीचा वापरही मोठ्या प्रमाणात झाला. तुमची बॅटरी नेहमीसारखी काम करत आहे.\n\n तुमचे डिव्हाइस पूर्ण चार्ज केल्यापासून <xliff:g id="HOUR">%1$s</xliff:g> तास वापरले गेले आहे.\n\n एकूण वापर:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"स्मार्ट बॅटरी व्यवस्थापक"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"बॅटरी आपोआप व्यवस्थापित करा"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"वापराच्या आधारावर अ‍ॅप्सचा वीजवापर आपोआप अॅडजस्ट करा"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"प्रतिबंधित अ‍ॅप्स"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="one">%1$d अ‍ॅप</item>
+      <item quantity="other">%1$d अ‍ॅप्स</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"अ‍ॅप बंद करायचे का?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"तुमचा फोन, बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP">%1$s</xliff:g> तुमच्या फोनला जागे ठेवत राहते.\n\nही समस्या सोडवण्यासाठी, तुम्ही अ‍ॅप थांबवू शकता.\n\nहे होत राहिल्यास, बॅटरीचे कार्यप्रदर्शन सुधारण्यासाठी तुम्हाला अ‍ॅप कदाचित अनइंस्टॉल करावे लागेल."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"तुमचा टॅबलेट, बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP">%1$s</xliff:g> तुमच्या टॅबलेटला जागे ठेवत राहते.\n\nही समस्या सोडवण्यासाठी, तुम्ही अ‍ॅप थांबवू शकता.\n\nहे होत राहिल्यास बॅटरीचे कार्यप्रदर्शन सुधारण्यासाठी तुम्हाला अ‍ॅप कदाचित अनइंस्टॉल करावे लागेल."</string>
@@ -2141,11 +2194,13 @@
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"अनप्लग केल्यापासून <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> साठी अंतिम अनप्लग केलेले असताना"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"वापर एकूण"</string>
-    <string name="menu_stats_refresh" msgid="1676215433344981075">"रीफ्रेश करा"</string>
+    <string name="menu_stats_refresh" msgid="1676215433344981075">"रिफ्रेश करा"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"मीडियासर्व्हर"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"अॅप ऑप्टिमायझेशन"</string>
     <string name="battery_saver" msgid="8172485772238572153">"बॅटरी सेव्‍हर"</string>
+    <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+    <skip />
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"स्वयंचलितपणे चालू करा"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"कधीही नाही"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g>बॅटरीवर"</string>
@@ -2302,7 +2357,7 @@
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"एक नेटवर्क जोडा"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"कनेक्ट केले नाही"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"नेटवर्क जोडा"</string>
-    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"सूची रीफ्रेश करा"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"सूची रिफ्रेश करा"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"वगळा"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"पुढील"</string>
     <string name="wifi_setup_back" msgid="144777383739164044">"परत"</string>
@@ -2366,6 +2421,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"खाते काढायचे?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"हे खाते काढल्याने त्याचे सर्व संदेश, संपर्क आणि टॅब्लेटवरील अन्य डेटा हटतील!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"हे खाते काढल्याने त्याचे सर्व संदेश, संपर्क आणि फोनवरील अन्य डेटा हटवला जाईल!"</string>
+    <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+    <skip />
     <string name="remove_account_failed" msgid="3901397272647112455">"या बदलाला आपल्या प्रशासकाद्वारे अनुमती नाही"</string>
     <string name="provider_label" msgid="7724593781904508866">"पुश सदस्यता"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2890,8 +2947,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"दृश्य व्यत्यय ब्लॉक करा"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"व्हिज्युअल सिग्नलना अनुमती द्या"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"जोडा"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"आता चालू करा"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"आता बंद करा"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"आता चालू करा"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"आता बंद करा"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"व्यत्यय आणू नका <xliff:g id="FORMATTED_TIME">%s</xliff:g> पर्यंत चालू असणार आहे"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"तुम्ही बंद करेपर्यंत व्यत्यय आणू नका चालू राहील"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"<xliff:g id="RULE_NAME">%s</xliff:g> या नियमाने व्यत्यय आणू नका आपोआप चालू केले"</string>
@@ -2930,7 +2987,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"अॅप सूचना"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"सूचना प्रकार"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"सूचना वर्गवारी गट"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"महत्त्व"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"वर्तन"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"ध्वनीला अनुमती द्या"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"सूचना कधीही दर्शवू नका"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"कोणताही ध्वनी किंवा व्हिज्युअल व्यत्यय नाही"</string>
@@ -2948,6 +3005,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"मध्यम महत्त्व"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"सर्वाधिक महत्व"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"त्वरित महत्त्व"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"सूचना दाखवा"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"सूचना साहाय्यक"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"सूचना प्रवेश"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"कार्य प्रोफाइल सूचनांचा अॅक्‍सेस ब्‍लॉक आहे"</string>
@@ -2978,9 +3036,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"व्यत्यय आणू नका प्रवेश"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"कोणत्याही इंस्टॉल केलेल्या अॅप्सने व्यत्यय आणू नका प्रवेशाची विनंती केली नाही"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"अॅप्स लोड करत आहे..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android या अ‍ॅपच्या सूचना या डिव्हाइसवर दिसणे ब्लॉक करत आहे"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android या प्रकारच्या सूचना या डिव्हाइसवर दिसणे ब्लॉक करत आहे"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"या सूचनांचा गट या डीव्हाइसवर दिसणे Android ब्लॉक करत आहे"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"तुमच्या विनंतीनुसार Android या अ‍ॅपच्या सूचना, या डिव्हाइसवर दिसणे ब्लॉक करत आहे"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"तुमच्या विनंतीनुसार Android, सूचनांच्या या वर्गवारीचे या डिव्हाइसवर दिसणे ब्लॉक करत आहे"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"तुमच्या विनंतीनुसार Android, सूचनांच्या या समूहाचे या डिव्हाइसवर दिसणे ब्लॉक करत आहे"</string>
     <string name="notification_channels" msgid="5346841743182627500">"श्रेण्या"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"अन्य"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3559,31 +3617,10 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"एकाधिक डिव्हाइसशी कनेक्ट केले"</string>
     <string name="demo_mode" msgid="2798762752209330277">"सिस्टम UI डेमो मोड"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"द्रुत सेटिंग्ज विकासक टाइल"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"मदत करण्यासाठी आम्ही येथे आहोत"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"आम्ही तुमच्यासाठी 24/7 येथे आहोत"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"आम्ही तुमच्यासाठी 24/7 येथे आहोत"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"कोणत्याही समस्येचे निराकरण करण्यात मदत करण्यासाठी आमचा सहाय्य कार्यसंघ येथे आहे"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"आमचा सहाय्य कार्यसंघ दररोज, दिवसभर येथे आहे"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"मदत शोधा किंवा साहाय्य तासांदरम्यान (स्थानिक वेळ) परत या:&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"फोन सहाय्य तास (स्थानिक वेळ)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"मदत शोधा किंवा टिपा आणि युक्त्या एक्सप्लोर करा"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"यासाठी समर्थन:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"परदेशी प्रवास करीत आहात?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"आंतरराष्ट्रीय शुल्क लागू होऊ शकते"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"फोन"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"चॅट करा"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"टिपा आणि युक्त्या एक्सप्लोर करा"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"मदत शोधा आणि अभिप्राय पाठवा"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"सहाय्याशी संपर्क साधा"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"साइन इन करा"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"साइन इन करू शकत नाही?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"सिस्टम माहिती पाठवा"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"परत दाखवू नका"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"हे विनंती करत आहेत"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"खाते जोडा"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"सिस्टम माहिती"</string>
+    <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+    <skip />
+    <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+    <skip />
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"कार्य प्रोफाइल सेटिंग्ज"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"संपर्क शोध"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"कॉलर आणि संपर्कांना ओळखण्यासाठी आपल्या संस्थेनुसार संपर्क शोधांची अनुमती द्या"</string>
@@ -3599,11 +3636,12 @@
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> सेकंद</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> सेकंद</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> प्रतीक्षा"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"संचय व्यवस्थापित करा"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"स्टोरेज स्थान मोकळे करण्यात मदत करण्यासाठी, स्टोरेज व्यवस्थापक तुमच्या डिव्हाइस वरून बॅक अप घेतलेले फोटो आणि व्हिडिओ काढतो."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"फोटो आणि व्हिडिओ काढा"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"संचय व्यवस्थापक"</string>
+    <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+    <skip />
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"स्वयंचलित"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"व्यक्तिचलित"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"आता स्थान मोकळे करा"</string>
@@ -3659,7 +3697,7 @@
     <string name="auto_sync_account_title" msgid="898796354710116383">"डेटा स्वयंचलितपणे संकालित करा"</string>
     <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"वैयक्तिक डेटा स्वयंचलितपणे संकालित करा"</string>
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"कार्य डेटा स्वयंचलितपणे संकालित करा"</string>
-    <string name="auto_sync_account_summary" msgid="692499211629185107">"अ‍ॅप्सना डेटा स्वयंचलितपणे रीफ्रेश करू द्या"</string>
+    <string name="auto_sync_account_summary" msgid="692499211629185107">"अ‍ॅप्सना डेटा स्वयंचलितपणे रिफ्रेश करू द्या"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"खाते संकालन"</string>
     <string name="account_sync_summary_some_on" msgid="3375930757891381175">"<xliff:g id="ID_2">%2$d</xliff:g> पैकी <xliff:g id="ID_1">%1$d</xliff:g> आयटमसाठी सिंक करणे चालू आहे"</string>
     <string name="account_sync_summary_all_on" msgid="570431636622254156">"सर्व आयटमसाठी सिंक करणे चालू करा"</string>
@@ -3769,8 +3807,10 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"तुमच्या नवीन टॅबलेटबद्दल माहिती देणार्‍या सफरीवर चला"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"तुमच्या नवीन डीव्हाइसबद्दल माहिती देणार्‍या सफरीवर चला"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"हे वैशिष्‍ट्य या डिव्हाइसवर उपलब्ध नाही"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"पूर्ण GNSS मापांची सक्ती करा"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"कुठल्याही ड्युटी सायकलिंग शिवाय सर्व GNSS तारामंडळे आणि वारंवारता ट्रॅक करा"</string>
+    <!-- no translation found for storage_access (8905018810338984531) -->
     <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+    <!-- no translation found for keywords_storage_access (3708874088152933579) -->
     <skip />
 </resources>
diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml
index 8be20cd..a1c71ac 100644
--- a/res/values-my/arrays.xml
+++ b/res/values-my/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"ညံ့သည်"</item>
     <item msgid="2042505933058940139">"ညံ့သည်"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"ရက်ပေါင်း ၆၀ ထက်ကျော်နေပါပြီ"</item>
     <item msgid="5692284879054004388">"ရက်ပေါင်း ၉၀ ထက်ကျော်နေပါပြီ"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"ကွန်ရက် စိတ်ကြိုက်ရွေးချယ်မှုကို အသုံးပြုရန်"</item>
+    <item msgid="8745603368609022803">"အခမဲ့ မဟုတ်သော အသုံးပြုခြင်းအဖြစ် သတ်မှတ်ရန်"</item>
+    <item msgid="2266114985518865625">"အခမဲ့ အသုံးပြုခြင်းအဖြစ် သတ်မှတ်ရန်"</item>
+  </string-array>
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 48a1b59..c61643a 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"သင်၏ စက်ပစ္စည်းများ"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"စက်ပစ္စည်းအသစ်ကို တွဲချိတ်ရန်"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"တွဲချိတ်၍ ဘလူးတုသ် ကိရိယာများသို့ ချိတ်ဆက်ရန် စက်ကိုခွင့်ပြုပါ"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"ဘလူးတုသ်နားကြပ်တွင် ဖုန်းမြည်သံကို ပိတ်ရန်"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"မိမိစိတ်ကြိုက် ဖုန်းမြည်သံများကို ဘလူးတုသ်နားကြပ်တွင် မဖွင့်ရန်"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"လောလောဆယ် ချိတ်ဆက်ထားခြင်း"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"သိမ်းဆည်းထားသည့် စက်ပစ္စည်းများ"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"စက်ပစ္စည်း ထည့်ပါ"</string>
@@ -330,6 +332,11 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"ရက်စွဲ  သတ်မှတ်ရန်"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"အက္ခရာစဉ်အလိုက်စီရန်"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"အချိန်ဇုန်နယ်အလိုက်စီရန်"</string>
+    <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> သည် <xliff:g id="TRANSITION_DATE">%2$s</xliff:g> တွင် စတင်ပါသည်။"</string>
+    <string name="zone_time_type_dst" msgid="8850494578766845276">"ဆောင်းရာသီ စံတော်ချိန်"</string>
+    <string name="zone_time_type_standard" msgid="3462424485380376522">"စံအချိန်"</string>
+    <string name="zone_menu_by_region" msgid="4603214570803607532">"ဒေသအလိုက် စံတောင်ချိန်"</string>
+    <string name="zone_menu_by_offset" msgid="1172774718486088771">"ပုံသေ စံတော်ချိန်"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"ရက်စွဲ"</string>
     <string name="time_picker_title" msgid="483460752287255019">"အချိန်"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"အလိုအလျောက်လော့ခ်ချရန်"</string>
@@ -348,6 +355,7 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"ကိုယ်ရေးအချက်အလက်"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"အကောင့်များ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"တည်နေရာ"</string>
+    <string name="location_settings_master_switch_title" msgid="3560242980335542411">"တည်နေရာကို သုံးရန်"</string>
     <string name="account_settings_title" msgid="626177544686329806">"အကောင့်များ"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"လုံခြုံရေးနှင့် တည်နေရာ"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"အသွင်ဝှက်ခြင်းနှင့် အထောက်အထားများ"</string>
@@ -691,6 +699,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"စပီကာဖုန်းအနေဖြင့်"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"သီချင်းနှင့်မီဒီယာအတွက်"</string>
     <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="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>
@@ -705,6 +715,7 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"အမည်"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"လက်မှတ်ထိုးဝင်ရန်"</string>
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> က Wi-Fi ဖွင့်လိုသည်"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> က Wi-Fi ပိတ်လိုသည်"</string>
@@ -722,6 +733,7 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"ဝိုင်ဖိုင်ဖွင့်ရန်"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Wi-Fi သုံးရန်"</string>
     <string name="wifi_settings_category" msgid="8719175790520448014">"ဝိုင်ဖိုင်ဆက်တင်များ"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"ကြိုးမဲ့ချိတ်ဆက်ပွိုင့်များအား သတ်မှတ်ခြင်း &amp;  စီမံခြင်း"</string>
@@ -833,7 +845,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPSရရှိုနိုင်သည်)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"သင်၏ ကွန်ရက် စကားဝှက်ကို ထည့်သွင်းရန်"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"ဖုန်းကုမ္ပဏီ Wi‑Fi ကွန်ရက်"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> မှတစ်ဆင့် ချိတ်ဆက်ရန်"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> မှတစ်ဆင့် ချိတ်ဆက်ရန်"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"တည်နေရာ တိကျမှုနှင့် တခြားရည်ရွယ်ချက်များအတွက် ပိုကောင်းစေရန် <xliff:g id="APP_NAME">%1$s</xliff:g> သည် ဝိုင်ဖိုင်ပိတ်ထားချိန်မှာပင်လျှင် ကွန်ရက်ရှာဖွေမှုကို ဖွင့်လိုသည်။\n\n အခြား ရှာဖွေလိုသော အပလီကေးရှင်းအားလုံးကို ခွင့်ပြုရမည်လား?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ဒါကို ပိတ်ရန်၊ လျှံစီး မီနူးထဲက အဆင့်မြင့် ဆီကို သွားပါ။"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ခွင့်ပြုရန်"</string>
@@ -909,10 +921,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP လိုင်း"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"သင်၏ အခြားစက်များအတွက် Wi‑Fi ကွန်ရက်ကို ဖွင့်ပေးရန် ဟော့စပေါ့ကို အသုံးပြုပါ။ ဟော့စပေါ့က သင်၏ မိုဘိုင်းဒေတာဆက်သွယ်မှုကို အသုံးပြုပြီး အင်တာနက်ကို ဖန်တီးပေးနိုင်ပါသည်။ မိုဘိုင်းဒေတာသုံးစွဲခ ပိုကုန်ကျနိုင်ပါသည်။"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ပါဝင်သည့်အကြောင်းအရာများကို အနီးတစ်ဝိုက်ရှိ စက်ပစ္စည်းများနှင့် မျှဝေရန်အတွက် အက်ပ်များက ဟော့စပေါ့တစ်ခု ဖွင့်နိုင်ပါသည်။"</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"ဟော့စပေါ့ကို အလိုအလျောက် ပိတ်ခြင်း"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"မည်သည့် စက်ပစ္စည်းကိုမျှ ချိတ်ဆက်ထားခြင်း မရှိလျှင် Wi‑Fi ဟော့စပေါ့ကို ပိတ်သွားပါမည်"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"ဟော့စပေါ့ ဖွင့်နေသည် …"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"ဟော့စပေါ့ ပိတ်နေသည် …"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ပွင့်နေသည်"</string>
@@ -961,6 +971,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"အရေးပေါ်လိပ်စာ"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Wi‑Fi သုံး၍ အရေးပေါ်ဖုန်းခေါ်သောအခါ အသုံးပြုသည့် သင့်တည်နေရာ"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958">"သီးသန့် DNS ဝန်ဆောင်မှုများအကြောင်း "<annotation id="url">"ပိုမိုလေ့လာရန်"</annotation></string>
     <string name="display_settings_title" msgid="1708697328627382561">"ဖန်သားပြင်"</string>
     <string name="sound_settings" msgid="5534671337768745343">"အသံ"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"အသံအတိုးအကျယ်"</string>
@@ -1308,6 +1319,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"သင့်<xliff:g id="NAME">^1</xliff:g>အသစ်သည် အလုပ်လုပ်ပါပြီ။ \n\nဓာတ်ပုံများ၊ ဖိုင်များနှင့် အပ်ဖ်ဒေတာများကို ဤစက်ပစ္စည်းသို့ ရွှေ့ရန် ကြိုတင်ချိန်ညှိချက်များထဲမှ  &gt; သိုလှောင်မှုသို့ သွားပါ။"</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> ရွှေ့မည်"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> နှင့်၎င်း၏ ဒေတာများကို<xliff:g id="NAME_0">^2</xliff:g> သို့ရွှေ့ခြင်းသည် အချိန်အနည်းငယ် ကြာပါမည်။ ရွှေ့လျားမှု မပြီးမြောက်မချင်း အပ်ဖ်များကို အသုံးပြု၍ရမည် မဟုတ်ပါ။ \n\nရွှေ့လျားနေစဉ် <xliff:g id="NAME_1">^2</xliff:g> ကိုမဖယ်ရှားပါနှင့်။"</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"ဒေတာများကို ရွှေ့ရန် အသုံးပြုသူ <xliff:g id="APP">^1</xliff:g> ကို လော့ခ်ဖွင့်ရပါမည်။"</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g>ရွှေ့နေသည်…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"ရွှေ့လျားနေစဉ် <xliff:g id="NAME">^1</xliff:g>ကိုမဖယ်ရှားပါနှင့်။ \n\nဤစက်ပစ္စည်းပေါ်ရှိ <xliff:g id="APP">^2</xliff:g> အပ်ဖ်ကို ရွှေလျားမှုမပြီးသ၍ အသုံးပြု၍ရမည်မဟုတ်ပါ။"</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ရွှေ့လျားမှု ပယ်ဖျက်မည်"</string>
@@ -1468,6 +1480,7 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"တည်နေရာ ရင်းမြစ်များ"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"တက်ဘလက်အကြောင်း"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"ဖုန်းအကြောင်း"</string>
+    <string name="about_settings" product="device" msgid="6717640957897546887">"စက်ပစ္စည်းအကြောင်း"</string>
     <string name="about_settings" product="emulator" msgid="221313099578564438">"တုပထားသည့်စက်ပစ္စည်း"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"ဥပဒေဆိုင်ရာအချက်အလက်၊ အခြေအနေ၊ ဆော့ဝဲလ်ဗားရှင်းအား ကြည့်ရှုရန်"</string>
     <string name="legal_information" msgid="5769301644270604095">"ဥပဒေဆိုင်ရာအချက်အလက်များ"</string>
@@ -1575,6 +1588,7 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"အက်ပ် <xliff:g id="COUNT">%1$d</xliff:g> ခုလုံးကို ကြည့်ရန်"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"သင်၏တက်ဘလက်နှင့် ကိုယ်ရေးကိုယ်တာ အချက်အလက်များသည် အမျိုးအမည် မသိသောအက်ပ်များ၏ တိုက်ခိုက်ခြင်းကို ပိုမိုခံရနိုင်ပါသည်။ ဤနေရာမှ ရယူထားသည့် အက်ပ်များကို ထည့်သွင်းအသုံးပြုခြင်းဖြင့် ဖြစ်ပေါ်လာနိုင်သော ဖုန်းပျက်စီးမှု သို့မဟုတ် ဒေတာဆုံးရှုံးမှုများအတွက် သင့်ထံ၌သာ တာဝန်ရှိကြောင်းကို သင်က သဘောတူရာရောက်ပါသည်။"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"သင်၏ဖုန်းနှင့် ကိုယ်ရေးကိုယ်တာ အချက်အလက်များသည် အမျိုးအမည် မသိသောအက်ပ်များ၏ တိုက်ခိုက်ခြင်းကို ပိုမိုခံရနိုင်ပါသည်။ ဤနေရာမှ ရယူထားသည့် အက်ပ်များကို ထည့်သွင်းအသုံးပြုခြင်းဖြင့် ဖြစ်ပေါ်လာနိုင်သော ဖုန်းပျက်စီးမှု သို့မဟုတ် ဒေတာဆုံးရှုံးမှုများအတွက် သင့်ထံ၌သာ တာဝန်ရှိကြောင်းကို သင်က သဘောတူရာရောက်ပါသည်။"</string>
+    <string name="install_all_warning" product="device" msgid="3648003301476423145">"သင့်စက်ပစ္စည်းနှင့် ကိုယ်ရေးကိုယ်တာ အချက်အလက်များသည် အမျိုးအမည် မသိသောအက်ပ်များ၏ တိုက်ခိုက်ခြင်းကို ပိုမိုခံရနိုင်ပါသည်။ ဤနေရာမှ ရယူထားသည့် အက်ပ်များကို ထည့်သွင်းအသုံးပြုခြင်းအားဖြင့် ဖြစ်ပေါ်လာနိုင်သော စက်ပစ္စည်းပျက်စီးမှု (သို့) ဒေတာဆုံးရှုံးမှုများအတွက် သင့်ထံ၌သာ တာဝန်ရှိကြောင်းကို သင်သဘောတူထားပါသည်။"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"အဆင့်မြင့်အပြင်အဆင်များ"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"ပိုမိုပြီးရွေးချယ်နိုင်သော အပြင်အဆင်များ ရရှိခြင်း"</string>
     <string name="application_info_label" msgid="5736524913065714880">"အက်ပ်အချက်အလက်များ"</string>
@@ -1874,6 +1888,9 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"စွမ်းဆောင်ရည် ကျစေနိုင်ပါသည်"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"ညွှန်တံရပ်သွားသည့်အခါ နှိပ်ရန်"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"မနှိပ်မီ စောင့်ချိန်"</string>
+    <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="enable_quick_setting" msgid="2366999897816894536">"အမြန်ဆက်တင်များတွင်ပြပါ"</string>
@@ -2030,14 +2047,35 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"စက်ပစ္စည်းကို နောက်ခံ၌ ပွင့်နေစေသည်"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"တည်နေရာကို မကြာခဏတောင်းဆိုနေသည်"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"အက်ပ် <xliff:g id="NUMBER">%1$d</xliff:g> ခုသည် ပုံမှန်အလုပ်မလုပ်ပါ"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"ဘက်ထရီသည် ကောင်းမွန်စွာ လုပ်ဆောင်နေပါသည်"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"အက်ပ်များသည် ပုံမှန်လုပ်ဆောင်နေပါသည်"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"ဘက်ထရီစွမ်းရည်နည်း"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"ဘက်ထရီက ကောင်းမွန်သော ဘက်ထရီသက်တမ်း ထုတ်မပေးနိုင်ပါ"</string>
+    <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"အဆင့်မြင့် ဘက်ထရီစီမံခန့်ခွဲမှုစနစ်ကို ဖွင့်ခြင်း"</string>
+    <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"ဘက်ထရီအသုံးပြုမှု ပိုကောင်းလာစေရန်အတွက် ဖွင့်ပါ"</string>
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
     <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"ဖုန်းအသုံးပြုမှုများခြင်း"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"တက်ဘလက် အသုံးပြုများခြင်း"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"စက်အသုံးပြုမှုများခြင်း"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"နောက်ဆုံးအကြိမ် အားအပြည့်သွင်းပြီးနောက် <xliff:g id="HOUR">%1$s</xliff:g> ခန့် အသုံးပြုထားပါသည်"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"သင့်စက်ကို အသုံးပြုမှုများသောကြောင့် ဘက်ထရီအားကိုလည်း များစွာသုံးထားပါသည်။ သင့်ဘက်ထရီသည် ပုံမှန် အလုပ်လုပ်နေပါသည်။\n\n နောက်ဆုံးအကြိမ် အားအပြည့်သွင်းပြီးနောက် သင့်စက်ကို <xliff:g id="HOUR">%1$s</xliff:g> ခန့် သုံးထားပါသည်။\n\n စုစုပေါင်း အသုံးပြုမှု-"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"သင့်တက်ဘလက်ကို အသုံးပြုမှုများသောကြောင့် ဘက်ထရီအားကိုလည်း များစွာသုံးထားပါသည်။ သင့်ဘက်ထရီသည် ပုံမှန် အလုပ်လုပ်နေပါသည်။\n\n နောက်ဆုံးအကြိမ် အားအပြည့်သွင်းပြီးနောက် သင့်တက်ဘလက်ကို <xliff:g id="HOUR">%1$s</xliff:g> ခန့် သုံးထားပါသည်။\n\n စုစုပေါင်း အသုံးပြုမှု-"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"သင့်စက်ကို အသုံးပြုမှုများသောကြောင့် ဘက်ထရီအားကိုလည်း များစွာသုံးထားပါသည်။ သင့်ဘက်ထရီသည် ပုံမှန် အလုပ်လုပ်နေပါသည်။\n\n နောက်ဆုံးအကြိမ် အားအပြည့်သွင်းပြီးနောက် သင့်စက်ကို <xliff:g id="HOUR">%1$s</xliff:g> ခန့် သုံးထားပါသည်။\n\n စုစုပေါင်း အသုံးပြုမှု-"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"အဆင့်မြင့် ဘက်ထရီ စီမံခန့်ခွဲမှုစနစ်"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"ဘက်ထရီကို အလိုအလျောက် စီမံခြင်း"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"အသုံးပြုမှုအလိုက် အက်ပ်များသုံးသည့် ပါဝါကို အလိုအလျောက် ချိန်ညှိရန်"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"ကန့်သတ်ထားသည့် အက်ပ်များ"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="other">အက်ပ် %1$d ခု</item>
+      <item quantity="one">အက်ပ် %1$d ခု</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"အက်ပ်ကို ရပ်ဆိုင်းလိုပါသလား။"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"<xliff:g id="APP">%1$s</xliff:g> က သင်၏ဖုန်းကို အမြဲပွင့်နေစေသောကြောင့် ၎င်းသည် ဘက်ထရီကို ပုံမှန်စီမံခန့်ခွဲ၍ မရပါ။\n\nဤပြဿနာကို ဖြေရှင်းရန် ၎င်းအက်ပ်ကို ရပ်ဆိုင်းကြည့်နိုင်သည်။\n\nပြဿနာဆက်လက်ရှိနေသေးပါက ဘက်ထရီစွမ်းဆောင်ရည်ကို တိုးမြှင့်ရန်အတွက် အက်ပ်ကို ဖယ်ရှားရန် လိုအပ်နိုင်ပါသည်။"</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"<xliff:g id="APP">%1$s</xliff:g> က သင်၏တက်ဘလက်ကို အမြဲပွင့်နေစေသောကြောင့် ၎င်းသည် ဘက်ထရီကို ပုံမှန်စီမံခန့်ခွဲ၍ မရပါ။\n\nဤပြဿနာကို ဖြေရှင်းရန် ၎င်းအက်ပ်ကို ရပ်ဆိုင်းကြည့်နိုင်သည်။\n\nပြဿနာဆက်လက်ရှိနေသေးပါက ဘက်ထရီစွမ်းဆောင်ရည်ကို တိုးမြှင့်ရန်အတွက် အက်ပ်ကို ဖယ်ရှားရန် လိုအပ်နိုင်ပါသည်။"</string>
@@ -2146,6 +2184,7 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"မီဒီယာဆာဗာ"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"အက်ပ်ပိုမိုကောင်းအောင်ပြုခြင်း"</string>
     <string name="battery_saver" msgid="8172485772238572153">"ဘက်ထရီ အားထိန်း"</string>
+    <string name="battery_saver_master_switch_title" msgid="622539414546588436">"ဘက်ထရီအားထိန်းကို သုံးရန်"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"အလိုအလျောက် ဖွင့်ရန်"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"ဘယ်တော့မှ"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"ဘတ်ထရီ <xliff:g id="PERCENT">%1$s</xliff:g> ၌"</string>
@@ -2366,6 +2405,7 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"အကောင့်ကို ဖယ်ရှားမလား"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"ဤအကောင့်ကို ဖယ်ရှားခြင်းအားဖြင့် တက်ဘလက်ထဲမှ မက်ဆေ့ဂျ်များ၊ အဆက်အသွယ်များနှင့် တခြားဒေတာများအားလုံး ပျက်သွားပါမည်။"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"ဤအကောင့်ကို ဖယ်ရှားခြင်းအားဖြင့် ဖုန်းထဲမှ မက်ဆေ့ဂျ်များ၊ အဆက်အသွယ်များနှင့် တခြားဒေတာများအားလုံး ပျက်သွားပါမည်။"</string>
+    <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"ဤအကောင့်ကို ဖယ်ရှားလိုက်ခြင်းဖြင့် စက်ပစ္စည်းထဲမှနေ၍ မက်ဆေ့ဂျ်၊ အဆက်အသွယ်နှင့် အခြားဒေတာများ အားလုံးကို ဖျက်လိုက်ပါမည်။"</string>
     <string name="remove_account_failed" msgid="3901397272647112455">"ဤပြောင်းလဲမှုကို သင့်စီမံခန့်ခွဲသူက ခွင့်မပြုပါ"</string>
     <string name="provider_label" msgid="7724593781904508866">"စာရင်းသွင်းထားမှုများ နှိပ်ရန်"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2890,8 +2930,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"မြင်ကွင်းပိတ်ခြင်းမှတားဆီးပါ"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"ပြသမှုများကို ခွင့်ပြုရန်"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"ထည့်ရန်"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ယခုဖွင့်ပါ"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"ယခု ပိတ်ပါ"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"ယခုဖွင့်ရန်"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"ယခုပိတ်ရန်"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"\"မနှောင့်ယှက်ရ\" ကို <xliff:g id="FORMATTED_TIME">%s</xliff:g> အထိ ဖွင့်ထားသည်"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"\"မနှောင့်ယှက်ရ\" သည် ၎င်းကို မပိတ်မချင်း ပွင့်နေပါမည်"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"\"မနှောင့်ယှက်ရ\" ကို <xliff:g id="RULE_NAME">%s</xliff:g> စည်းကမ်းအရ အလိုအလျောက် ဖွင့်ပေးခဲ့သည်"</string>
@@ -2930,7 +2970,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"အက်ပ်အသိပေးချက်များ"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"အသိပေးချက် အမျိုးအစား"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"အကြောင်းကြားချက် အုပ်စုအမျိုးအစား"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"အရေးပါမှု"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"အပြုအမူ"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"အသံကို ခွင့်ပြုရန်"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"အကြောင်းကြားချက်များကို ဘယ်တော့မှ မပြပါနှင့်"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"အသံ သို့မဟုတ် ရုပ်ပုံ ဖွင့်ခြင်းတို့ကို မပြုလုပ်လိုပါ"</string>
@@ -2948,6 +2988,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"အတန်အသင့် အရေးပါသည်"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"အလွန်အရေးပါသည်"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"အလွန့်အလွန် အရေးပါသည်"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"အကြောင်းကြားချက်များ ပြရန်"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"သတိပေးချက် အကူအညီ"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"အကြောင်းကြားချက် ရယူခြင်း"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"အလုပ်ပရိုဖိုင် အကြောင်းကြားချက်များသို့ ဝင်ရောက်ခြင်းကို ပိတ်ထားသည်"</string>
@@ -2978,9 +3019,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"\"မနှောင့်ယှက်ရ\" ကိုအသုံးပြုခြင်း"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"မနှောက်ယှက်ရန် အသုံးပြုခြင်းအတွက် မည်သည့်ထည့်သွင်းထားသည့် အပ်ဖ်မှ တောင်းဆိုမှုမရှိပါ"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"အက်ပ်များကို တင်နေ..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"၎င်းအက်ပ်၏ သတိပေးချက်များကို ဤစက်ပစ္စည်းတွင် ပေါ်မလာစေရန် Android က ပိတ်ထားပါသည်"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"၎င်းသတိပေးချက်အမျိုးအစားကို ဤစက်ပစ္စည်းတွင် ပေါ်မလာစေရန် Android က ပိတ်ဆို့ထားပါသည်"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"၎င်းသတိပေးချက်အုပ်စုကို ဤစက်ပစ္စည်းတွင် ပေါ်မလာစေရန် Android က ပိတ်ဆို့ထားပါသည်"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"သင့်တောင်းဆိုချက်အရ Android သည် ဤအက်ပ်၏ အကြောင်းကြားချက်များ ဤစက်ပစ္စည်းပေါ်တွင် ပေါ်မလာအောင် ပိတ်ထားပါသည်"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"သင့်တောင်းဆိုချက်အရ Android သည် ဤအကြောင်းကြားချက်အမျိုးအစားများ ဤစက်ပစ္စည်းပေါ်တွင် ပေါ်မလာအောင် ပိတ်ထားပါသည်"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"သင့်တောင်းဆိုချက်အရ Android သည် ဤအကြောင်းကြားချက်အုပ်စုများ ဤစက်ပစ္စည်းပေါ်တွင် ပေါ်မလာအောင် ပိတ်ထားပါသည်"</string>
     <string name="notification_channels" msgid="5346841743182627500">"အမျိုးအစားများ"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"အခြား"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3559,31 +3600,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"စက်ပစ္စည်းအများအပြားနှင့် ချိတ်ဆက်ထားပါသည်"</string>
     <string name="demo_mode" msgid="2798762752209330277">"စနစ် UI သရုပ်ပြမုဒ်"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"ဆော့ဖ်ဝဲအင်ဂျင်နီယာ အကွက်များကို အမြန်သတ်မှတ်ခြင်း"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"ကျွန်ုပ်တို့ကူညီဖို့ အသင့်ရှိနေပါသည်"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"သင့်အတွက် ကျွန်ုပ်တို့သည် တစ်နေ့ ၂၄ နာရီနှင့် ၇ ရက်တပတ်လုံး အသင့်ရှိနေပါသည်။"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"ကျွန်ုပ်တို့သည် တစ်နေ့ ၂၄ နာရီနှင့် ၇ ရက်တပတ်လုံး အသင့်ရှိနေပါသည်"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"ကျွန်ုပ်တို့၏ ဝန်ဆောင်မှုပေးရေးအဖွဲ့သည် ပြဿနာအရပ်ရပ်ကို ဖြေရှင်းပေးရန် အသင့်ရှိပါသည်။"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"ကျွန်ုပ်တို့၏ ဝန်ဆောင်မှုပေးရေးအဖွဲ့သည် နေ့တိုင်းဤနေရာတွင် တစ်နေကုန်အသင့်ရှိနေပါသည်"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"အကူအညီကိုရှာပါ သို့မဟုတ် ဝန်ဆောင်မှုပေးသည့်အချိန်တွင် ပြန်လာပါ (ဒေသစံတော်ချိန်) − &lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"ဖုန်းဖြင့် ဝန်ဆောင်မှုပေးသည့် အချိန် (ဒေသစံတော်ချိန်)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"အကူအညီကိုရှာဖွေပါ သို့မဟုတ် နည်းလမ်းများကို ရှာဖွေပါ"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"အောက်ပါနိုင်ငံများတွင် ပံ့ပိုးပေးသည် −"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"ပြည်ပခရီးထွက်မလား။"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"အပြည်ပြည်ဆိုင်ရာ ငွေကျသင့်မှုများ ရှိနိုင်သည်"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"ဖုန်း"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"ချတ်လုပ်ရန်"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"နည်းစနစ်များနှင့် အကြံဉာဏ်များကို လေ့လာရန်"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"အကူအညီရှာရန်နှင့် အကြံပြုချက်ပေးပို့ရန်"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"ဝန်ဆောင်မှုပေးရေးအဖွဲ့သို့ ဆက်သွယ်ပါ"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"လက်မှတ်ထိုး ဝင်ပါ"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"လက်မှတ်ထိုးဝင်၍ မရဘူးလား။"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"စနစ်အချက်အလက်များကို ပို့ပါ"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"နောက်တစ်ခါ မပြပါနှင့်"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"အဖြစ် တောင်းဆိုနေသည်"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"အကောင့်ထည့်ရန်"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"စနစ်အချက်အလက်"</string>
+    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"ဝင်းဒိုး မျဉ်းဆွဲခြင်း"</string>
+    <string name="layer_trace_quick_settings_title" msgid="2447147947568109649">"အလွှာကို မျဉ်းဆွဲခြင်း"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"အလုပ်ပရိုဖိုင်ဆက်တင်များ"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"အဆက်အသွယ်ကို ရှာဖွေပါ"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"ခေါ်ဆိုသူများနှင့် အဆက်အသွယ်များကို မည်သူမည်ဝါဖြစ်ကြောင်း ခွဲခြားနိုင်ရန်အတွက် သင့်အဖွဲ့အစည်းအမည်ကို အဆက်အသွယ်အား ရှာဖွေခွင့်ပြုပါ"</string>
@@ -3599,11 +3617,11 @@
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> စက္ကန့်</item>
       <item quantity="one">၁ စက္ကန့်</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"စောင့်ဆိုင်းရမည့်အချိန် ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"သိုလှောင်ခန်းကို စီမံခန့်ခွဲပါ"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"သိုလှောင်ခန်း နေရာလွတ်များ ရှိလာစေရန် သိုလှောင်ခန်းမန်နေဂျာသည် သင့်စက်ပစ္စည်းပေါ်ရှိ မိတ္တူကူးယူထားသည့် ဓာတ်ပုံနှင့် ဗီဒီယိုများကို ဖယ်ရှားလိုက်ပါမည်။"</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ဓာတ်ပုံနှင့် ဗီဒီယိုများကို ဖယ်ရှားပါ"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"သိုလှောင်ခန်းမန်နေဂျာ"</string>
+    <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"သိုလှောင်ခန်း စီမံခန့်ခွဲမှုစနစ်ကို သုံးရန်"</string>
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"အလိုအလျောက်"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"ကိုယ်တိုင်ထည့်သွင်းခြင်း"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"ယခုနေရာလွတ်ပြုလုပ်ပါ"</string>
@@ -3769,8 +3787,8 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"သင်၏တက်ဘလက်အသစ်ကို လေ့လာကြည့်ရှုပါ"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"သင်၏ စက်ပစ္စည်းအသစ်ကို လေ့လာကြည့်ရှုပါ"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ဤဝန်ဆောင်မှုကို ဤစက်ပစ္စည်းတွင် မရရှိနိုင်ပါ"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
-    <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
-    <skip />
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"GNSS အတိုင်းအတာအပြည့် သက်ရောက်ရန်"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"လည်ပတ်ချိန်မပါဘဲ GNSS စက်ဝိုင်းပုံမြင်ကွင်းကျယ်ပုံများနှင့် ကြိမ်နှုန်းအားလုံးကို ခြေရာခံပါ"</string>
+    <string name="storage_access" msgid="8905018810338984531">"သိုလှောင်ခန်း အသုံးပြုခွင့်"</string>
+    <string name="keywords_storage_access" msgid="3708874088152933579">"သိုလှောင်ခန်း အသုံးပြုခွင့် သတ်မှတ်ချက် ဖိုင်လမ်းညွှန်"</string>
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index ceae0b3..f650da5 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Dårlig"</item>
     <item msgid="2042505933058940139">"Dårlig"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"Over 60 dager gamle"</item>
     <item msgid="5692284879054004388">"Over 90 dager gamle"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"Bruk nettverksinnstilling"</item>
+    <item msgid="8745603368609022803">"Behandle som med datamåling"</item>
+    <item msgid="2266114985518865625">"Behandle som uten datamåling"</item>
+  </string-array>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 0df2374..79b90b7 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Enhetene dine"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Koble til en ny enhet"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"Tillat at enheten kobler sammen med og kobler til Bluetooth-enheter"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Slå av innenbåndsringing"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Ikke spill av tilpassede ringelyder på Bluetooth-hodetelefoner"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Tilkoblet for øyeblikket"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"Lagrede enheter"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"Legg til enhet"</string>
@@ -330,6 +332,16 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"Angi dato"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sortér alfabetisk"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sortér etter tidssone"</string>
+    <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+    <skip />
+    <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+    <skip />
+    <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+    <skip />
     <string name="date_picker_title" msgid="1338210036394128512">"Dato"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Tid"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Låses automatisk"</string>
@@ -348,6 +360,8 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Profilinformasjon"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Kontoer"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Posisjon"</string>
+    <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+    <skip />
     <string name="account_settings_title" msgid="626177544686329806">"Kontoer"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"Sikkerhet og posisjon"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Kryptering og legitimasjon"</string>
@@ -559,7 +573,7 @@
     <string name="lock_failed_attempts_now_wiping_device" msgid="5047439819181833824">"For mange mislykkede forsøk. Dataene på denne enheten blir slettet."</string>
     <string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"For mange mislykkede forsøk. Denne brukeren blir slettet."</string>
     <string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"For mange mislykkede forsøk. Denne jobbprofilen og tilknyttede data blir slettet."</string>
-    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Avvis"</string>
+    <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"Lukk"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"Må være minst <xliff:g id="COUNT">%d</xliff:g> tegn"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN-koden må være minst <xliff:g id="COUNT">%d</xliff:g> sifre"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"Fortsett"</string>
@@ -691,6 +705,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Som høyttalertelefon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"For musikk og medier"</string>
     <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="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>
@@ -705,6 +721,8 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Navn"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+    <skip />
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> ønsker å slå på Wi-Fi"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> ønsker å slå av Wi-Fi"</string>
@@ -722,6 +740,8 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Slå på Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+    <skip />
     <string name="wifi_settings_category" msgid="8719175790520448014">"Innstillinger for Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Sett opp og styr trådløse aksesspunkt"</string>
@@ -833,7 +853,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tilgjengelig)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Skriv inn nettverkspassordet ditt"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"Operatørens Wi-Fi-nettverk"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"Koble til via <xliff:g id="NAME">%1%s</xliff:g>"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Koble til via <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> ønsker å bruke nettverksskanning, også når Wi-Fi er slått av, for bedre posisjonsnøyaktighet og andre formål. \n\nVil du tillate dette for alle apper som prøver å skanne?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"For å slå dette av går du til Avansert i overflytsmenyen."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Tillat"</string>
@@ -909,10 +929,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP-bånd"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Bruk Wi-Fi-soner for å opprette Wi-Fi-nettverk for de andre enhetene dine. Wi-Fi-soner gir Internett-tilgang ved hjelp av mobildatatilkoblingen din. Ytterligere avgifter for databruk kan påløpe."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Du kan bruke apper til å opprette Wi-Fi-soner for deling av innhold med enheter i nærheten."</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Slå av Wi-Fi-sone automatisk"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Wi‑Fi-sonen blir slått av hvis ingen enheter er koblet til"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Slår på Wi-Fi-sone …"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Slår av trådløs sone …"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> er aktiv"</string>
@@ -961,6 +979,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"Adresse for nødssituasjoner"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Brukes som posisjonen din når du gjør et nødanrop over Wi-Fi"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Finn ut mer"</annotation>" om funksjoner for privat DNS"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skjerm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Lyd"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumer"</string>
@@ -1308,6 +1327,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"<xliff:g id="NAME">^1</xliff:g> fungerer. \n\nFor å flytte bilder, filer og programdata til denne enheten, gå til Innstillinger og lagring."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Flytt <xliff:g id="APP">^1</xliff:g>"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Det tar bare et par øyeblikk å flytte <xliff:g id="APP">^1</xliff:g> og tilhørende data til <xliff:g id="NAME_0">^2</xliff:g>. Du kan ikke bruke appen før flyttingen er ferdig. \n\nIkke fjern <xliff:g id="NAME_1">^2</xliff:g> mens flyttingen pågår."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Du må låse opp brukeren <xliff:g id="APP">^1</xliff:g> for å flytte data."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Flytter <xliff:g id="APP">^1</xliff:g> …"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Ikke fjern <xliff:g id="NAME">^1</xliff:g> under flyttingen. \n\n<xliff:g id="APP">^2</xliff:g>-appen på denne enheten blir ikke tilgjengelig før flyttingen er ferdig."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Avbryt flyttingen"</string>
@@ -1468,6 +1488,8 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"Posisjonskilder"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Om nettbrettet"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Om telefonen"</string>
+    <!-- no translation found for about_settings (6717640957897546887) -->
+    <skip />
     <string name="about_settings" product="emulator" msgid="221313099578564438">"Om den emulerte enheten"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Vis juridisk informasjon, status og programvareversjon"</string>
     <string name="legal_information" msgid="5769301644270604095">"Juridisk informasjon"</string>
@@ -1575,6 +1597,8 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"Se alle de <xliff:g id="COUNT">%1$d</xliff:g> appene"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Nettbrettet ditt og personopplysningene dine er mer sårbare for angrep hvis du bruker ukjente apper. Ved å installere apper fra denne kilden godtar du at du selv er ansvarlig for enhver skade på nettbrettet eller tap av data som kan oppstå, fra bruk av slike apper."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefonen din og personopplysningene dine er mer sårbare for angrep hvis du bruker ukjente apper. Ved å installere apper fra denne kilden godtar du at du selv er ansvarlig for enhver skade på telefonen eller tap av data som kan oppstå, fra bruk av slike apper."</string>
+    <!-- no translation found for install_all_warning (3648003301476423145) -->
+    <skip />
     <string name="advanced_settings" msgid="1777249286757067969">"Avanserte innstillinger"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Aktiver flere innstillingsalternativer"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Info om appen"</string>
@@ -1874,6 +1898,12 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Kan påvirke ytelsen"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klikk etter at markøren stanser"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Forsinkelse før klikk"</string>
+    <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+    <skip />
+    <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+    <skip />
+    <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+    <skip />
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"PÅ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"AV"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Vis i hurtiginnstillingene"</string>
@@ -2030,14 +2060,37 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Vekker enheten i bakgrunnen"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Forespør posisjon ofte"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apper fungerer ikke som de skal"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Alt er bra med batteriet"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Apper fungerer som de skal"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Lav batterikapasitet"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Batteriet kan ikke gi god batterilevetid"</string>
+    <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+    <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Telefonen er brukt mye"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Nettbrettet er brukt mye"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Enheten er brukt mye"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Brukt omtrent <xliff:g id="HOUR">%1$s</xliff:g> siden sist batteriet var fulladet"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Telefonen din har blitt brukt mye, og dette har brukt mye batteristrøm. Batteriet ditt oppfører seg som normalt.\n\n Telefonen din er brukt omtrent <xliff:g id="HOUR">%1$s</xliff:g> siden sist batteriet var fulladet.\n\n Total bruk:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Nettbrettet ditt har blitt brukt mye, og dette har brukt mye batteristrøm. Batteriet ditt oppfører seg som normalt.\n\n Nettbrettet ditt er brukt omtrent <xliff:g id="HOUR">%1$s</xliff:g> siden sist batteriet var fulladet.\n\n Total bruk:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Enheten din har blitt brukt mye, og dette har brukt mye batteristrøm. Batteriet ditt oppfører seg som normalt.\n\n Enheten din er brukt omtrent <xliff:g id="HOUR">%1$s</xliff:g> siden sist batteriet var fulladet.\n\n Total bruk:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"Smart batteristyring"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"Administrer batteriet automatisk"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"Juster strømbruken til apper automatisk basert på bruk"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"Begrensede apper"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="other">%1$d apper</item>
+      <item quantity="one">%1$d app</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"Vil du stoppe appen?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Telefonen kan ikke styre batteriet som normalt fordi <xliff:g id="APP">%1$s</xliff:g> holder telefonen aktiv.\n\nFor å forsøke å løse problemet kan du stoppe appen.\n\nHvis problemet vedvarer, må du kanskje avinstallere appen for å få bedre batteriytelse."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Nettbrettet kan ikke styre batteriet som normalt fordi <xliff:g id="APP">%1$s</xliff:g> holder nettbrettet aktivt.\n\nFor å forsøke å løse problemet kan du stoppe appen.\n\nHvis problemet vedvarer, må du kanskje avinstallere appen for å få bedre batteriytelse."</string>
@@ -2146,6 +2199,8 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Medietjener"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Appoptimalisering"</string>
     <string name="battery_saver" msgid="8172485772238572153">"Batterisparing"</string>
+    <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+    <skip />
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Slå på automatisk"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Aldri"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"med <xliff:g id="PERCENT">%1$s</xliff:g> batteri"</string>
@@ -2366,6 +2421,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"Vil du fjerne kontoen?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Hvis du fjerner denne kontoen, slettes alle tilhørende meldinger, kontakter og andre data fra nettbrettet!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Hvis du fjerner denne kontoen, slettes alle tilhørende e-poster, kontakter og andre data fra telefonen."</string>
+    <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+    <skip />
     <string name="remove_account_failed" msgid="3901397272647112455">"Denne endringen er ikke tillatt av administratoren"</string>
     <string name="provider_label" msgid="7724593781904508866">"Push-abonnementer"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2890,8 +2947,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blokkér visuelle forstyrrelser"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Tillat visuelle signaler"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"Legg til"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"SLÅ PÅ NÅ"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"SLÅ AV NÅ"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Slå på nå"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Slå av nå"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Ikke forstyrr er slått på til <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Ikke forstyrr er på til du slår det av"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Ikke forstyrr ble slått på automatisk av en regel (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
@@ -2930,7 +2987,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Appvarsler"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Varselkategori"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"Varselkategorigruppe"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"Viktighet"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"Atferd"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"Tillat lyd"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Vis aldri varsler"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Ingen lyd eller visuell forstyrrelse"</string>
@@ -2948,6 +3005,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Middels viktighet"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Høy viktighet"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"Svært høy viktighet"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"Vis varsler"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Varselassistent"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Varseltilgang"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Tilgang til varsler fra jobbprofilen er blokkert"</string>
@@ -2978,9 +3036,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"«Ikke forstyrr»-tilgang"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ingen installerte apper har bedt om «Ikke forstyrr»-tilgang"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Laster inn apper …"</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blokkerer varslene fra denne appen fra å vises på denne enheten"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blokkerer denne varselkategorien fra å vises på denne enheten"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android blokkerer denne varselgruppen fra å vises på denne enheten"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"I henhold til forespørselen din blokkerer Android varslene fra denne appen fra å vises på denne enheten"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"I henhold til forespørselen din blokkerer Android denne varselkategorien fra å vises på denne enheten"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"I henhold til forespørselen din blokkerer Android denne varselgruppen fra å vises på denne enheten"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorier"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Annet"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3559,31 +3617,10 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"Fliser med hurtiginnstillinger for utviklere"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"Vi er her for å hjelpe deg"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Vi er her for å hjelpe deg døgnet rundt, sju dager i uken"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Vi er her for å hjelpe deg døgnet rundt, sju dager i uken"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"Brukerstøtteteamet vårt er her for å hjelpe til med å løse eventuelle problemer"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Brukerstøtteteamet vårt er tilgjengelig hele dagen – hver eneste dag"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Søk i brukerstøtten eller kom tilbake i brukerstøttens åpningstid (lokal tid):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Brukerstøttens åpningstid (lokal tid)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Søk etter hjelp eller utforsk tips og triks"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"Støtte for:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"Reiser du i utlandet?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"Utenlandstakster kan påløpe"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Se gode tips"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Søk i hjelp og send tilbakemelding"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"Kontakt brukerstøtten"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Logg på"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"Har du problemer med påloggingen?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"Send systeminformasjon"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Ikke vis dette igjen"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"Sender forespørsel som"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"Legg til konto"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"Systeminformasjon"</string>
+    <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+    <skip />
+    <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+    <skip />
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Innstillinger for jobbprofilen"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontaktsøk"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Tillat kontaktsøk for organisasjonen din for å identifisere innringere og kontakter"</string>
@@ -3599,11 +3636,12 @@
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sekunder</item>
       <item quantity="one">1 sekund</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Ventetid: ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Administrer lagring"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"For å frigjøre lagringsplass fjernes sikkerhetskopierte bilder og videoer fra enheten din av lagringsadministratoren."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Fjern bilder og videoer"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Lagringsadministrator"</string>
+    <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+    <skip />
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automatisk"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuelle innstillinger"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Frigjør lagringsplass nå"</string>
@@ -3769,8 +3807,10 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Få en innføring i det nye nettbrettet ditt"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Få en innføring i den nye enheten din"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Denne funksjonen er ikke tilgjengelig på denne enheten"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Tving fullstendige GNSS-målinger"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Spor alle GNSS-konstellasjoner og -frekvenser uten syklus for oppgaver"</string>
+    <!-- no translation found for storage_access (8905018810338984531) -->
     <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+    <!-- no translation found for keywords_storage_access (3708874088152933579) -->
     <skip />
 </resources>
diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml
index f151d59..ce16994 100644
--- a/res/values-ne/arrays.xml
+++ b/res/values-ne/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"कमजोर"</item>
     <item msgid="2042505933058940139">"कमजोर"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"६० दिनभन्दा बढी पुरानो"</item>
     <item msgid="5692284879054004388">"९० दिनभन्दा बढी पुरानो"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"नेटवर्कसम्बन्धी प्राथमिकता प्रयोग गर्नुहोस्"</item>
+    <item msgid="8745603368609022803">"मिटर गरिएको रूपमा व्यवहार गर्नुहोस्"</item>
+    <item msgid="2266114985518865625">"मिटर नगरिएको रूपमा व्यवहार गर्नुहोस्"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 9ebd004..bfcf581 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"तपाईंका यन्त्रहरू"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"नयाँ यन्त्रलाई जोडा बनाउनुहोस्"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"यन्त्रलाई ब्लुटुथ यन्त्रहरूसँग जोडा बनाउन र जडान गर्न दिनुहोस्"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"इन-ब्यान्ड घन्टी नामक सुविधा असक्षम पार्नुहोस्"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"ब्लुटुथका हेडसेटहरूमा फोनको इच्छ्याएका रिङटोनहरू प्ले नगर्नुहोला"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"हाल जडान अवस्थामा छ"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"सुरक्षित गरिएका यन्त्रहरू"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"यन्त्र थप्नुहोस्"</string>
@@ -330,6 +332,16 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"मिति सेट गर्नुहोस्"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"क्रमबद्ध अनुसार मिलाउनुहोस्"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"समय क्षेत्रद्वारा क्रमबद्ध गर्नुहोस्"</string>
+    <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+    <skip />
+    <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+    <skip />
+    <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+    <skip />
     <string name="date_picker_title" msgid="1338210036394128512">"मिति"</string>
     <string name="time_picker_title" msgid="483460752287255019">"समय"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"स्वतः लक गर्नुहोस्"</string>
@@ -348,6 +360,8 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"प्रोफाइल जानकारी"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"खाताहरू"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"स्थान"</string>
+    <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+    <skip />
     <string name="account_settings_title" msgid="626177544686329806">"खाताहरू"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"सुरक्षा र स्थान"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"इन्क्रिप्सन र प्रमाणहरू"</string>
@@ -453,7 +467,7 @@
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"चेतावनी: खुला गर्न <xliff:g id="COUNT">^1</xliff:g> भन्दा बढी असफल प्रयासहरू पछि तपाईँको उपकरण पुछिने छ!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"तपाईँको पासवर्ड टाइप गर्नुहोस्"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"इन्क्रिप्सन असफल"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"इन्क्रिप्सन अवरूद्ध भयो र पूरा हुन सक्दैन। परिणाम स्वरूप तपाईंको ट्याब्लेटको डेटा अब पहुँचयोग्य हुँदैन।\n \n तपाईंको ट्याब्लेटको प्रयोग सुरु गर्नका लागि तपाईंले कारखाना पुनःसेट गर्नु  पर्छ। जब पुनःसेट हुन्छ तब तपाईं ट्याब्लेट सेट गर्नुहुन्छ, तपाईंको Google खातामा जगेडा गरिएको कुनै पनि डेटा पुनर्स्थापना गर्ने अवसर तपाईंलाई हुने छ।"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"इन्क्रिप्सन अवरूद्ध भयो र पूरा हुन सक्दैन। परिणामस्वरूप तपाईंको ट्याब्लेटको डेटा अब पहुँचयोग्य हुँदैन।\n \n तपाईंको ट्याब्लेटको प्रयोग सुरु गर्नका लागि तपाईंले कारखाना पुनःसेट गर्नु  पर्छ। जब पुनःसेट हुन्छ तब तपाईं ट्याब्लेट सेट गर्नुहुन्छ, तपाईंको Google खातामा जगेडा गरिएको कुनै पनि डेटा पुनर्स्थापना गर्ने अवसर तपाईंलाई हुने छ।"</string>
     <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"एन्क्रिप्सन रोकिएको थियो र पूरा हुन सकेन। नतिजाको रूपमा तपाईंको फोनमा डेटा पहुँच यग्य छैन। \n\nतपाईंको फोनको उपयोग फरि सुरु गर्नको लागि तपाईंले एउटा फ्याक्ट्रि पुनःसेट गर्न जरूरी छ। जब तपाईं पुनःसेटपछि तपाईंको फोन सेटअप गर्नु हुन्छ भने  कुनै पनि डेटा जुन तपाईंको Google खातामा ब्याकअप गरिएको थियो तपाईंलाई पुनःप्राप्त गर्ने अवसर हुने छ।"</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"गुप्तिकरण उल्टाउन असफल"</string>
     <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"तपाईँले प्रविष्ट गर्नुभएको पासवर्ड ठीक छ, तर दुर्भाग्यबश तपाईँको डेटा बिग्रिएको छ।\n\n तपाईँको ट्याब्लेट पुन: प्रयोग गर्न फ्याक्ट्री रिसेट गर्न पर्छ। रिसेट गरे पश्चात जब तपाई आफ्नो ट्याब्लेट सेटअप गर्नुहुन्छ तपाईँले Google खातामा ब्याकअप भए सम्मका डेटा पुनर्स्थापना गर्ने अवसर प्राप्त गर्नु हुनेछ।"</string>
@@ -691,6 +705,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"स्पिकर फोनको रूपमा"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"संगीत र मिडियाका लागि"</string>
     <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="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>
@@ -705,6 +721,8 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"नाम"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"२.४ GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"५ GHz"</string>
+    <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+    <skip />
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fi सक्रिय गर्न चाहन्छ"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fi निष्क्रिय पार्न चाहन्छ"</string>
@@ -722,6 +740,8 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi-Fi खोल्नुहोस्"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+    <skip />
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi सेटिङहरू"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"ताररहित पहुँच बिन्दुहरू सेटअप र प्रबन्ध गर्नुहोस्"</string>
@@ -833,7 +853,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS उपलब्ध)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"आफ्नो सञ्जाल पासवर्ड प्रविष्ट गर्नुहोस्"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"सेवा प्रदायकको Wi‑Fi नेटवर्क"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> मार्फत जडान गर्नुहोस्"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> मार्फत जडान गर्नुहोस्"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"स्थान सटिकता सुधार गर्न र अन्य प्रायोजनहरूको लागि, <xliff:g id="APP_NAME">%1$s</xliff:g> नेटवर्क स्क्यानिङ खुला भएको चाहन्छ, Wi-Fi बन्द भएता पनि।\n\nके यसलाई सबै अनुप्रयोगहरूको लागि अनुमति दिन चाहनुहुन्छ जसले स्क्यान गर्न चाहन्छन्?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"यो बन्द गर्न, अतिप्रवाह मेनुमा उन्नतमा जानुहोस्।"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"अनुमति दिनुहोस्"</string>
@@ -898,21 +918,19 @@
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g>सँग जोडिने आमन्त्रण के रद्द गर्न चाहनु हुन्छ ?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"यो समूह बिर्सनुभयो?"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi-Fi हटस्पट"</string>
-    <string name="wifi_hotspot_off_subtext" msgid="2199911382555864644">"अन्य यन्त्रहरूसँग इन्टरनेट वा सामग्री आदान-प्रदान गरिरहेको छैन"</string>
+    <string name="wifi_hotspot_off_subtext" msgid="2199911382555864644">"अन्य यन्त्रहरूसँग इन्टरनेट वा सामग्री आदान प्रदान गरिरहेको छैन"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5936710887156133458">"हटस्पटमार्फत यो ट्याब्लेटको इन्टरनेट जडान साझा गर्दै"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="5556202634866621632">"हटस्पटमार्फत यो फोनको इन्टरनेट जडान साझा गर्दै"</string>
-    <string name="wifi_hotspot_on_local_only_subtext" msgid="5017191966153008">"अनुप्रयोगले सामग्री आदान-प्रदान गर्दैछ। इन्टरनेट जडान साझा गर्न हटस्पट निष्क्रिय पार्नुहोस् र त्यसपछि फेरि सक्रिय गर्नुहोस्‌"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="5017191966153008">"अनुप्रयोगले सामग्री आदान प्रदान गर्दैछ। इन्टरनेट जडान साझा गर्न हटस्पट निष्क्रिय पार्नुहोस् र त्यसपछि फेरि सक्रिय गर्नुहोस्‌"</string>
     <string name="wifi_hotspot_name_title" msgid="8237000746618636778">"हटस्पटको नाम"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="3378299995508671967">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> सक्रिय गर्दै..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"अन्य यन्त्रहरू <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> मा जडान गर्न सक्छन्"</string>
     <string name="wifi_hotspot_password_title" msgid="8676859981917573801">"हटस्पटको पासवर्ड"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP ब्यान्ड"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"आफ्ना अन्य यन्त्रहरूका लागि Wi‑Fi नेटवर्क सिर्जना गर्न हटस्पट प्रयोग गर्नुहोस्। हटस्पटले तपाईंको मोबाइल डेटा जडान प्रयोग गरेर इन्टरनेट प्रदान गर्दछ। अतिरिक्त मोबाइल डेटाको शुल्क लाग्न सक्छ।"</string>
-    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"अनुप्रयोगहरूले नजिकैका यन्त्रहरूसँग सामग्री आदान-प्रदान गर्न एउटा हटस्पट सिर्जना गर्न सक्छन्।"</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"अनुप्रयोगहरूले नजिकैका यन्त्रहरूसँग सामग्री आदान प्रदान गर्न एउटा हटस्पट सिर्जना गर्न सक्छन्।"</string>
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Wi‑Fi हटस्पट स्वतः निष्क्रिय पार्नुहोस्"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"कुनै पनि यन्त्र जडान नहुँदा Wi‑Fi हटस्पट स्वतः निष्क्रिय हुनेछ"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"हटस्पट खुल्दै..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"हटस्पट बन्द गरिँदै..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> सक्रिय छ"</string>
@@ -961,6 +979,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"आपतकालीन ठेगाना"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"तपाईंले Wi‑Fi मार्फत आपतकालीन कल गर्दा उक्त ठेगानालाई तपाईंको स्थानको रूपमा प्रयोग गरिन्छ"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958">"DNS का सुविधाहरूबारे "<annotation id="url">"थप जान्नुहोस्"</annotation></string>
     <string name="display_settings_title" msgid="1708697328627382561">"प्रदर्शन"</string>
     <string name="sound_settings" msgid="5534671337768745343">"आवाज"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"भोल्युम"</string>
@@ -1286,7 +1305,7 @@
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"पोर्टेबल भण्डारणको रूपमा प्रयोग गर्नुहोस्"</string>
     <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"यन्त्रहरू बीच तस्बिर र अन्य मिडिया सार्नका लागि।"</string>
     <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"आन्तरिक भण्डारणको रूपमा प्रयोग गर्नुहोस्"</string>
-    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"यस यन्त्रमा मात्र कुनै पनि चीज, अनुप्रयोग र तस्बिरहरू  भण्डारण गर्नका लागि। यसलाई ढाँचा मिलाउन आवश्यक हुन्छ जसले अर्का यन्त्रहरूसँग काम गर्नबाट रोक्छ।"</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"यस यन्त्रमा मात्र कुनै पनि चिज, अनुप्रयोग र तस्बिरहरू  भण्डारण गर्नका लागि। यसलाई ढाँचा मिलाउन आवश्यक हुन्छ जसले अर्का यन्त्रहरूसँग काम गर्नबाट रोक्छ।"</string>
     <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"आन्तरिक भण्डारणको रुपमा ढाँचा गर्नुहोस्"</string>
     <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"यो सुरक्षित बनाउन यसलाई <xliff:g id="NAME_0">^1</xliff:g> ढाँचा बनाउन आवश्यकता छ। \n\nढाँचामा मिलाएपछि, यो यन्त्रमा यसले <xliff:g id="NAME_1">^1</xliff:g> मात्र काम गर्नेछ। \n\n"<b>" ढाँचा मिलाउँदा <xliff:g id="NAME_2">^1</xliff:g> मा हालैका भण्डारित सबै डेटा मेटिन्छ।"</b>" डेटा गुमाउनुपर्ने बाट जोगिन, यसको ब्याकअप राख्ने बारे विचार गर्नुहोस्।"</string>
     <string name="storage_wizard_format_confirm_public_title" msgid="4905690038882041566">"पोर्टेबल भण्डारणका रूपमा फरम्याट गर्नुहोस्"</string>
@@ -1308,6 +1327,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"तपाईँको नयाँ <xliff:g id="NAME">^1</xliff:g> ले काम गर्दैछ। \n\n यो यन्त्रमा तस्बिरहरू, फाइलहरू, र अनुप्रयोग डेटा सार्न, सेटिङ &amp;gt मा जानुहोस्; भण्डारण गर्नुहोस्।"</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"सार्नुहोस् <xliff:g id="APP">^1</xliff:g>"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="NAME_0">^2</xliff:g> मा <xliff:g id="APP">^1</xliff:g> र यसको डेटा सार्न केही बेर मात्र लिनेछ। तपाईं सार्ने क्रम पूरा नहुन्जेल अनुप्रयोग प्रयोग गर्न सक्नुहुने छैन। \n\n सार्ने क्रममा <xliff:g id="NAME_1">^2</xliff:g> नहटाउनुहोस्।"</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"डेटा सार्न तपाईंले प्रयोगकर्ताको <xliff:g id="APP">^1</xliff:g> अनलक गर्नु पर्ने हुन्छ।"</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"सार्दै <xliff:g id="APP">^1</xliff:g>..."</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"सार्ने क्रममा <xliff:g id="NAME">^1</xliff:g> नहटाउनुहोस्। \n\nसार्ने क्रम पूरा नहुन्जेल सम्म यो यन्त्रको<xliff:g id="APP">^2</xliff:g> अनुप्रयोग उपलब्ध हुने छैन।"</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"सार्ने कार्य रद्द गर्नुहोस्"</string>
@@ -1413,7 +1433,7 @@
     <string name="bluetooth_tethering_off_subtext_config" msgid="376389105752995580">"ब्लुटुथमार्फत यो <xliff:g id="DEVICE_NAME">%1$d</xliff:g> को इन्टरनेट जडान साझा गर्दै"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> उपकरणहरूभन्दा बढीसँग टेदर गर्न सक्दैन।"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> अनटेथर गरिने छ।"</string>
-    <string name="tethering_footer_info" msgid="7112228674056306147">"आफ्नो मोबाइल डेटा जडानमार्फत अन्य यन्त्रहरूलाई इन्टरनेट उपलब्ध गराउन हटस्पट र टेदरिङ प्रयोग गर्नुहोस्। नजिकैका यन्त्रहरूसँग सामग्री आदान-प्रदान गर्नका निम्ति अनुप्रयोगहरूले हटस्पट सिर्जना गर्न पनि सक्छन्।"</string>
+    <string name="tethering_footer_info" msgid="7112228674056306147">"आफ्नो मोबाइल डेटा जडानमार्फत अन्य यन्त्रहरूलाई इन्टरनेट उपलब्ध गराउन हटस्पट र टेदरिङ प्रयोग गर्नुहोस्। नजिकैका यन्त्रहरूसँग सामग्री आदान प्रदान गर्नका निम्ति अनुप्रयोगहरूले हटस्पट सिर्जना गर्न पनि सक्छन्।"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"मद्दत"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"मोबाइल नेटवर्क"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"मोबाईल योजना"</string>
@@ -1468,6 +1488,8 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"स्थान स्रोतहरू"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"ट्याब्लेटको बारेमा"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"फोनको बारेमा"</string>
+    <!-- no translation found for about_settings (6717640957897546887) -->
+    <skip />
     <string name="about_settings" product="emulator" msgid="221313099578564438">"अनुसरण गरिएको यन्त्र बारे"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"कानुनी जानकारी, वस्तुस्थिति, सफ्ट्वेयर संस्करण हेर्नुहोस्"</string>
     <string name="legal_information" msgid="5769301644270604095">"कानुनी जानकारी"</string>
@@ -1575,6 +1597,8 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"सबै <xliff:g id="COUNT">%1$d</xliff:g> अनुप्रयोगहरू हेर्नुहोस्"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"तपाईंको ट्याब्लेट र व्यक्तिगत डेटा अज्ञात अनुप्रयोगहरूबाट हुने आक्रमणमा पर्न सक्ने जोखिम अझ बढी हुन्छ। यो स्रोतबाट प्राप्त हुने अनुप्रयोगहरूको स्थापना गरेर, तिनीहरूको प्रयोगबाट तपाईंको ट्याब्लेटमा हुनसक्ने क्षति वा डेटाको नोक्सानीको जिम्मेवार तपाईं आफैँ हुनुहुन्छ भन्ने कुरामा तपाईं सहमत हुनुहुन्छ।"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"तपाईंको फोन र व्यक्तिगत डेटा अज्ञात अनुप्रयोगहरूबाट हुने आक्रमणमा पर्न सक्ने जोखिम अझ बढी हुन्छ। यो स्रोतबाट प्राप्त हुने अनुप्रयोगहरूको स्थापना गरेर, तिनीहरूको प्रयोगबाट तपाईंको फोनमा हुनसक्ने क्षति वा डेटाको नोक्सानीको जिम्मेवार तपाईं आफैँ हुनुहुन्छ भन्ने कुरामा तपाईं सहमत हुनुहुन्छ।"</string>
+    <!-- no translation found for install_all_warning (3648003301476423145) -->
+    <skip />
     <string name="advanced_settings" msgid="1777249286757067969">"जटिल सेटिङहरू"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"थप सेटिङ विकल्पहरू सक्षम पार्नुहोस्"</string>
     <string name="application_info_label" msgid="5736524913065714880">"अनुप्रयोग जानकारी"</string>
@@ -1874,6 +1898,12 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"कार्यसम्पादनमा असर पार्न सक्छ"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"प्वाइन्टर चल्न रोकेपछि क्लिक गर्नुहोस्"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"क्लिक गर्न अघि ढिलाइ"</string>
+    <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+    <skip />
+    <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+    <skip />
+    <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+    <skip />
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"सक्रिय छ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"निष्क्रिय छ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"द्रुत सेटिङमा देखाउनुहोस्"</string>
@@ -2030,14 +2060,37 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"पृष्ठभूमिमा यन्त्रलाई सक्रिय गर्दै"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"बारम्बार स्थानसम्बन्धी जानकारी प्राप्त गर्ने अनुरोध गर्दैछ"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> अनुप्रयोगहरूले असामान्य व्यवहार देखाउँदैछन्"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"ब्याट्री राम्रो स्थितिमा छ"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"अनुप्रयोगले सामान्य तरिकाले काम गर्दैछ"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"ब्याट्रीको कम चार्ज क्षमता"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"ब्याट्रीको चार्ज स्तर बढी समयसम्म कायम रहन सक्दैन"</string>
+    <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+    <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"फोन अत्यधिक प्रयोग गरियो"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"ट्याब्लेट अत्यधिक प्रयोग गरियो"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"यन्त्र अत्यधिक प्रयोग गरियो"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"ब्याट्रीलाई पछिल्लोपटक पूर्ण रूपमा चार्ज गरेपछि यन्त्र लगभग <xliff:g id="HOUR">%1$s</xliff:g> प्रयोग गरियो"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"अत्यधिक प्रयोग गरिएबापत तपाईंको फोनले अत्यन्त बढी ब्याट्री खपत गऱ्यो। तपाईंको ब्याट्री पहिलाको जसरी नै चल्दै छ।\n\n ब्याट्रीलाई पछिल्लोपटक पूर्ण रूपमा चार्ज गरेपछि तपाईंको फोन लगभग <xliff:g id="HOUR">%1$s</xliff:g> प्रयोग गरियो।\n\n ब्याट्रीको कुल प्रयोग प्रतिशत:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"अत्यधिक प्रयोग गरिएबापत तपाईंको ट्याब्लेटले अत्यन्त बढी ब्याट्री खपत गऱ्यो। तपाईंको ब्याट्री पहिलाको जसरी नै चल्दै छ।\n\n ब्याट्रीलाई पछिल्लोपटक पूर्ण रूपमा चार्ज गरेपछि तपाईंको ट्याब्लेट लगभग <xliff:g id="HOUR">%1$s</xliff:g> प्रयोग गरियो।\n\n ब्याट्रीको कुल प्रयोग प्रतिशत:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"अत्यधिक प्रयोग गरिएबापत तपाईंको यन्त्रले अत्यन्त बढी ब्याट्री खपत गऱ्यो। तपाईंको ब्याट्री पहिलाको जसरी नै चल्दै छ।\n\n ब्याट्रीलाई पछिल्लोपटक पूर्ण रूपमा चार्ज गरेपछि तपाईंको यन्त्र लगभग <xliff:g id="HOUR">%1$s</xliff:g> प्रयोग गरियो।\n\n ब्याट्रीको कुल प्रयोग प्रतिशत:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"स्मार्ट ब्याट्री प्रबन्धक"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"ब्याट्री स्वतः व्यवस्थापन गर्नुहोस्"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"प्रयोगको आधारमा अनुप्रयोगहरूले प्रयोग गर्ने पावर स्वचालित रूपमा समायोजन गर्नुहोस्"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"प्रतिबन्धित अनुप्रयोगहरू"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="other">%1$d अनुप्रयोगहरू</item>
+      <item quantity="one">%1$d अनुप्रयोग</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"अनुप्रयोगलाई रोक्ने हो?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईंको फोनलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्ने प्रयास गर्न तपाईं उक्त अनुप्रयोगलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यप्रदर्शनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नुपर्ने हुनसक्छ।"</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईंको ट्याब्लेटलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्ने प्रयास गर्न तपाईं उक्त अनुप्रयोगलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यप्रदर्शनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नुपर्ने हुनसक्छ।"</string>
@@ -2146,6 +2199,8 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"मिडिया सर्भर"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"अनुप्रयोग आफू अनुकूल"</string>
     <string name="battery_saver" msgid="8172485772238572153">"ब्याट्री सेभर"</string>
+    <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+    <skip />
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"स्वतः खोल्नुहोस्"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"कहिले पनि होइन"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> ब्याट्री हुँदा"</string>
@@ -2366,6 +2421,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"खाता हटाउने हो?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"यो खाता मेटाउँदा ट्याब्लेटबाट यसका सबै सन्देश,सम्पर्क र अन्य डेटा मेटाइनेछन्!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"यस खातालाई हटाउँदा फोनबाट सम्पूर्ण सन्देश, सम्पर्क र अन्य डेटा हट्छ!"</string>
+    <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+    <skip />
     <string name="remove_account_failed" msgid="3901397272647112455">"यसलाई परिवर्तन गर्न तपाईंको प्रशासकले अनुमति दिँदैन"</string>
     <string name="provider_label" msgid="7724593781904508866">"सदस्यता ठेल्नुहोस्"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2890,8 +2947,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"दृश्य सम्बन्धी बाधालाई रोक्नु"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"सङ्केतहरूलाई देखिन दिनुहोस्"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"थप्नुहोस्"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"अहिले नै सक्रिय गर्नुहोस्"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"अहिले नै निष्क्रिय पार्नुहोस्"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"अहिले नै सक्रिय गर्नुहोस्"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"अहिले नै निष्क्रिय पार्नुहोस्"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> सम्म बाधा नपुर्‍याउनुहोस् नामक मोड सक्रिय हुन्छ"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"तपाईंले निष्क्रिय नपारेसम्म बाधा नपुर्‍याउनुहोस् नामक मोड सक्रिय रहनेछ"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"(<xliff:g id="RULE_NAME">%s</xliff:g>) नामक नियमले बाधा नपुर्‍याउनुहोस् नामक मोडलाई स्वतः सक्रिय गर्‍यो"</string>
@@ -2930,7 +2987,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"अनुप्रयोग सूचनाहरू"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"सूचनाको प्रकार"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"सूचनासम्बन्धी कोटिको समूह"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"महत्त्व"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"व्यवहार"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"ध्वनिलाई अनुमति दिनुहोस्"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"सूचनाहरू कहिल्यै नदेखाउनुहोस्"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"कुनै आवाज ननिकाल्ने वा दृश्य सम्बन्धी अवरोध नपुर्याउने"</string>
@@ -2948,6 +3005,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"सामान्य महत्वको सूचना"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"उच्च महत्त्वको सूचना"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"जरूरी महत्त्वको सूचना"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"सूचनाहरू देखाउनुहोस्"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"सूचना सहायक"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"सूचना पहुँच"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"कार्य प्रोफाइलमाथिका पहुँच सम्बन्धी सूचनाहरूलाई बन्द गरिएको छ"</string>
@@ -2978,9 +3036,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"पहुँचमा बाधा नपुर्‍यानुहोस्"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"कुनै पनि स्थापित अनुप्रयोगहरू द्वारा पहुँचमा बाधा नपुर्‍यानुहोस् को माग गरेका छैनन्"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"अनुप्रयोगहरू लोड हुँदै..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android ले यो यन्त्रमा यस अनुप्रयोगका सूचनाहरूलाई देखिनबाट रोक लगाइरहेको छ"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android ले यो यन्त्रमा यस प्रकारका सूचनाहरूलाई देखिनबाट रोक लगाइरहेको छ"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android ले यस यन्त्रमा यी सूचनाहरूको समूहलाई देखिनबाट रोक लगाइरहेको छ"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"तपाईंको अनुरोधबमोजिम Android ले यस अनुप्रयोगका सूचनाहरूलाई यो यन्त्रमा देखाउन दिइरहेको छैन"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"तपाईंको अनुरोधबमोजिम Android ले सूचनाहरूको यस कोटिलाई यो यन्त्रमा देखिन दिइरहेको छैन"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"तपाईंको अनुरोधबमोजिम Android ले सूचनाहरूको यस समूहलाई यो यन्त्रमा देखाउन दिइरहेको छैन"</string>
     <string name="notification_channels" msgid="5346841743182627500">"कोटीहरू"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"अन्य"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3561,31 +3619,10 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"धेरै यन्त्रहरूमा जडान गरियो"</string>
     <string name="demo_mode" msgid="2798762752209330277">"प्रणालीको UI को प्रदर्शन मोड"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"द्रुत सेटिङहरू सम्बन्धी विकासकर्ताका टाइलहरू"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"हामी मद्दतका लागि तयार छौँ"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"हामी तपाईँको सहायताका लागि २४/७ उपलब्ध छौँ"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"हामी तपाईँको सहायताका लागि २४ घन्टा ७ दिन उपलब्ध छौँ"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"हाम्रो समर्थन टोली जुनसुकै समस्याको समाधान गर्नमा मद्दतका लागि तयार छ"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"हाम्रो सहायता टोली पूरा दिन र हरेक दिन तपाईँको सहायताका लागि उपलब्ध छ"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"मद्दत खण्डमा गई खोज्नुहोस् वा सहायताको समयावधिमा फेरि आउनुहोस् (स्थानीय समय):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"फोन मार्फत गरिने सहायताको समयावधि (स्थानीय समय)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"मद्दतमा खोज्नुहोस् वा सुझाव र जुक्तिहरूको अन्वेषण गर्नुहोस्"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"निम्नका लागि समर्थन:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"विदेश यात्रा गर्दै हुनुहुन्छ?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"अन्तर्राष्ट्रिय शुल्कहरू लाग्न सक्छन्"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"फोन"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"कुराकानी"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"सुझाव र जुक्तिहरूको अन्वेषण गर्नुहोस्"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"मद्दत खण्डमा खोज्नुहोस् र प्रतिक्रिया पठाउनु‍ु‍होस्"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"ग्राहक सहायतामा सम्पर्क गर्नुहोस्"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"साइन इन गर्नुहोस्"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"साइन इन गर्न सक्नुहुन्न?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"प्रणाली सम्बन्धी जानकारी पठाउनुहोस्"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"फेरि नदेखाउनुहोस्"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"निम्न प्रयोगकर्ताको रूपमा अनुरोध गर्दै"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"खाता थप्नुहोस्"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"प्रणाली सम्बन्धी जानकारी"</string>
+    <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+    <skip />
+    <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+    <skip />
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"कार्य प्रोफाइलका सेटिङहरू"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"सम्पर्कको खोजी"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"कलर र सम्पर्कहरूको पहिचान गर्न तपाईँको संगठन अनुसार गरिने सम्पर्कका खोजीहरूलाई अनुमति दिनुहोस्"</string>
@@ -3601,11 +3638,12 @@
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> सेकेन्ड</item>
       <item quantity="one">१ सेकेन्ड</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> कुर्नुहोस्"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"भण्डारणको व्यवस्थापन गर्नुहोस्"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"भण्डारण प्रबन्धकले भण्डारणको ठाउँ खाली गर्न मद्दतका लागि तपाईँको यन्त्रबाट ब्याक अप गरिएका तस्बिर र भिडियोहरू हटाउँदछ।"</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"तस्बिर र भिडियोहरूलाई मेट्नुहोस्"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"भण्डारण प्रबन्धक"</string>
+    <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+    <skip />
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"स्वतः"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"म्यानुअल"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"अहिले नै ठाउँ खाली गर्नुहोस्"</string>
@@ -3771,8 +3809,10 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"आफ्नो नयाँ ट्याब्लेटको बारेमा राम्रोसँग जान्नुहोस्‌"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"आफ्नो नयाँ यन्त्रको बारेमा राम्रोसँग जान्नुहोस्‌"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"यस यन्त्रमा यो सुविधा उपलब्ध छैन"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"पूर्ण GNSS मापनहरू बलपूर्वक लागू गर्नुहोस्"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"कुनै उपयोगिता अनुपात बिना नै सबै GNSS कन्स्टेलेसन तथा फ्रिक्वेन्सीहरूलाई ट्र्याक गर्नुहोस्"</string>
+    <!-- no translation found for storage_access (8905018810338984531) -->
     <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+    <!-- no translation found for keywords_storage_access (3708874088152933579) -->
     <skip />
 </resources>
diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml
index 3748d8e..b7e1598 100644
--- a/res/values-pa/arrays.xml
+++ b/res/values-pa/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"ਖ਼ਰਾਬ"</item>
     <item msgid="2042505933058940139">"ਕਮਜ਼ੋਰ"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"60 ਦਿਨਾਂ ਤੋਂ ਜ਼ਿਆਦਾ ਪੁਰਾਣੀ"</item>
     <item msgid="5692284879054004388">"90 ਦਿਨਾਂ ਤੋਂ ਜ਼ਿਆਦਾ ਪੁਰਾਣੀ"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"ਨੈੱਟਵਰਕ ਤਰਜੀਹ ਵਰਤੋ"</item>
+    <item msgid="8745603368609022803">"ਮੀਟਰਬੱਧ ਮੰਨੋ"</item>
+    <item msgid="2266114985518865625">"ਗੈਰ-ਮੀਟਰਬੱਧ ਮੰਨੋ"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 2d559ca..2c9c54a 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ਤੁਹਾਡੀਆਂ ਡੀਵਾਈਸਾਂ"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"ਨਵਾਂ ਡੀਵਾਈਸ ਜੋੜਾਬੱਧ ਕਰੋ"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"ਡੀਵਾਈਸ ਨੂੰ ਜੋੜਾਬੱਧ ਅਤੇ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸਾਂ ਨਾਲ ਕਨੈਕਟ ਹੋਣ ਦਿਓ"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"ਬੈਂਡ ਦੀ ਘੰਟੀ ਵਜਾਉਣ ਨੂੰ ਬੰਦ ਕਰੋ"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"ਵਿਉਂਤੀਆਂ ਫ਼ੋਨ ਰਿੰਗਟੋਨਾਂ ਨੂੰ ਬਲੂਟੁੱਥ ਹੈੱਡਸੈੱਟਾਂ \'ਤੇ ਨਾ ਚਲਾਓ"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"ਵਰਤਮਾਨ ਵਿੱਚ ਕਨੈਕਟ ਕੀਤਾ ਹੋਇਆ ਹੈ"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"ਰੱਖਿਅਤ ਕੀਤੀਆਂ ਡੀਵਾਈਸਾਂ"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"ਡੀਵਾਈਸ ਸ਼ਾਮਲ ਕਰੋ"</string>
@@ -330,6 +332,16 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"ਤਾਰੀਖ ਸੈੱਟ ਕਰੋ"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"ਵਰਨਮਾਲਾ ਅਨੁਸਾਰ ਛਾਂਟੋ"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"ਸਮਾਂ ਜ਼ੋਨ ਮੁਤਾਬਕ ਛਾਂਟੋ"</string>
+    <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+    <skip />
+    <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+    <skip />
+    <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+    <skip />
     <string name="date_picker_title" msgid="1338210036394128512">"ਤਾਰੀਖ"</string>
     <string name="time_picker_title" msgid="483460752287255019">"ਸਮਾਂ"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"ਸਵੈਚਲਿਤ ਤਰੀਕੇ ਨਾਲ ਲਾਕ ਕਰੋ"</string>
@@ -348,6 +360,8 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"ਪ੍ਰੋਫਾਈਲ ਜਾਣਕਾਰੀ"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ਖਾਤੇ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ਟਿਕਾਣਾ"</string>
+    <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+    <skip />
     <string name="account_settings_title" msgid="626177544686329806">"ਖਾਤੇ"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"ਸੁਰੱਖਿਆ ਅਤੇ ਟਿਕਾਣਾ"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਅਤੇ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ"</string>
@@ -691,6 +705,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ਸਪੀਕਰ ਫ਼ੋਨ ਦੇ ਤੌਰ ਤੇ"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"ਸੰਗੀਤ ਅਤੇ ਮੀਡੀਆ ਲਈ"</string>
     <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="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>
@@ -705,6 +721,8 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"ਨਾਮ"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+    <skip />
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> ਵਾਈ-ਫਾਈ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> ਵਾਈ-ਫਾਈ ਨੂੰ ਬੰਦ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ"</string>
@@ -722,6 +740,8 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"ਵਾਈ‑ਫਾਈ"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"ਵਾਈ‑ਫਾਈ ਚਾਲੂ ਕਰੋ"</string>
     <string name="wifi_settings" msgid="29722149822540994">"ਵਾਈ‑ਫਾਈ"</string>
+    <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+    <skip />
     <string name="wifi_settings_category" msgid="8719175790520448014">"ਵਾਈ-ਫਾਈ ਸੈਟਿੰਗਾਂ"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"ਵਾਈ‑ਫਾਈ"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"ਵਾਇਰਲੈਸ ਐਕਸੈੱਸ ਪੁਆਇੰਟ ਸੈੱਟ ਅੱਪ &amp; ਵਿਵਸਥਿਤ ਕਰੋ"</string>
@@ -833,7 +853,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ਉਪਲਬਧ)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ਆਪਣਾ ਨੈੱਟਵਰਕ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"ਕੈਰੀਅਰ ਵਾਈ‑ਫਾਈ ਨੈੱਟਵਰਕ"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> ਰਾਹੀਂ ਕਨੈਕਟ ਕਰੋ"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> ਰਾਹੀਂ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ਟਿਕਾਣਾ ਸ਼ੁੱਧਤਾ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ ਅਤੇ ਹੋਰਾਂ ਮੰਤਵਾਂ ਲਈ, <xliff:g id="APP_NAME">%1$s</xliff:g> ਨੈੱਟਵਰਕ ਸਕੈਨਿੰਗ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ, ਭਾਵੇਂ ਵਾਈ-ਫਾਈ ਬੰਦ ਹੋਵੇ। \n\nਕੀ ਇਸਨੂੰ ਸਾਰੀਆਂ ਐਪਾਂ ਲਈ ਆਗਿਆ ਦੇਣੀ ਹੈ ਜਿਹਨਾਂ ਨੂੰ ਸਕੈਨ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ਇਸਨੂੰ ਬੰਦ ਕਰਨ ਲਈ, ਓਵਰਫ਼ਲੋ ਮੀਨੂ ਵਿੱਚ ਵਿਕਸਿਤ ਤੇ ਜਾਓ।"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ਆਗਿਆ ਦਿਓ"</string>
@@ -909,10 +929,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP ਬੈਂਡ"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"ਆਪਣੇ ਹੋਰ ਡੀਵਾਈਸਾਂ ਲਈ ਇੱਕ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਬਣਾਉਣ ਲਈ ਹੌਟਸਪੌਟ ਦੀ ਵਰਤੋਂ ਕਰੋ। ਹੌਟਸਪੌਟ ਤੁਹਾਡੇ ਮੋਬਾਈਲ ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਇੰਟਰਨੈੱਟ ਮੁਹੱਈਆ ਕਰਵਾਉਂਦਾ ਹੈ। ਵਧੀਕ ਮੋਬਾਈਲ ਡਾਟਾ ਖਰਚੇ ਲਏ ਜਾ ਸਕਦੇ ਹਨ।"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"ਨੇੜਲੇ ਡੀਵਾਈਸ ਨਾਲ ਸਮੱਗਰੀ ਨੂੰ ਸਾਂਝਾ ਕਰਨ ਲਈ ਐਪਾਂ ਇੱਕ ਹੌਟਸਪੌਟ ਬਣਾ ਸਕਦੇ ਹਨ।"</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"ਹੌਟਸਪੌਟ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਬੰਦ ਕਰੋ"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"ਕਿਸੇ ਵੀ ਡੀਵਾਈਸ ਦੇ ਨਾ ਕਨੈਕਟ ਹੋਣ \'ਤੇ ਵਾਈ-ਫਾਈ ਹੌਟਸਪੌਟ ਬੰਦ ਹੋ ਜਾਵੇਗਾ"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"ਹੌਟਸਪੌਟ ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"ਹੌਟਸਪੌਟ ਬੰਦ ਕਰ ਰਿਹਾ ਹੈ…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ਕਿਰਿਆਸ਼ੀਲ ਹੈ"</string>
@@ -961,6 +979,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"ਸੰਕਟਕਾਲੀਨ ਪਤਾ"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਕੀਤੀ ਜਾਣ ਵਾਲੀ ਕਿਸੇ ਸੰਕਟਕਾਲੀਨ ਕਾਲ ਵੇਲੇ ਇਹ ਪਤਾ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958">"ਨਿੱਜੀ DNS ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਬਾਰੇ "<annotation id="url">"ਹੋਰ ਜਾਣੋ"</annotation></string>
     <string name="display_settings_title" msgid="1708697328627382561">"ਡਿਸਪਲੇ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ਧੁਨੀ"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ਵੋਲਯੂਮ"</string>
@@ -1308,6 +1327,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"ਤੁਹਾਡਾ ਨਵਾਂ <xliff:g id="NAME">^1</xliff:g> ਕੰਮ ਕਰ ਰਿਹਾ ਹੈ। \n\nਇਸ ਡੀਵਾਈਸ ਵਿੱਚ ਫੋਟੋਆਂ, ਫ਼ਾਈਲਾਂ, ਅਤੇ ਐਪ ਡਾਟਾ ਨੂੰ ਲੈ ਜਾਣ ਲਈ, ਸੈਟਿੰਗਾਂ ਅਤੇ ਸਟੋਰੇਜ \'ਤੇ ਜਾਓ।"</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> ਨੂੰ ਮੂਵ ਕਰੋ"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> ਅਤੇ ਇਸਦੇ ਡਾਟਾ ਨੂੰ <xliff:g id="NAME_0">^2</xliff:g> ਵਿੱਚ ਮੂਵ ਕਰਨਾ ਸਿਰਫ਼ ਕੁਝ ਸਮਾਂ ਲੈਂਦਾ ਹੈ। ਤੁਸੀਂ ਉਦੋਂ ਤੱਕ ਇਸ ਐਪ ਦੀ ਵਰਤੋਂ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਹੋਵੋਗੇ ਜਦੋਂ ਤੱਕ ਇਹ ਮੂਵ ਪੂਰਾ ਨਹੀਂ ਹੋ ਜਾਂਦਾ ਹੈ। \n\nਮੂਵ ਦੇ ਦੌਰਾਨ <xliff:g id="NAME_1">^2</xliff:g> ਨੂੰ ਨਾ ਹਟਾਓ।"</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"ਡਾਟੇ ਨੂੰ ਲਿਜਾਉਣ ਤੋਂ ਪਹਿਲਾਂ ਤੁਹਾਨੂੰ ਵਰਤੋਂਕਾਰ <xliff:g id="APP">^1</xliff:g> ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> ਨੂੰ ਮੂਵ ਕਰ ਰਿਹਾ ਹੈ…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"ਮੂਵ ਦੇ ਦੌਰਾਨ <xliff:g id="NAME">^1</xliff:g> ਨੂੰ ਨਾ ਹਟਾਓ। \n\nਇਸ ਡੀਵਾਈਸ \'ਤੇ <xliff:g id="APP">^2</xliff:g> ਐਪ ਉਦੋਂ ਤੱਕ ਉਪਲਬਧ ਨਹੀਂ ਹੋਵੇਗੀ ਜਦੋਂ ਤੱਕ ਮੂਵ ਪੂਰਾ ਨਹੀਂ ਹੋ ਜਾਂਦਾ ਹੈ।"</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ਹਲਚਲ ਨੂੰ ਰੱਦ ਕਰੋ"</string>
@@ -1468,6 +1488,8 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"ਨਿਰਧਾਰਿਤ ਸਰੋਤ"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"ਟੈਬਲੈੱਟ ਬਾਰੇ"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"ਫ਼ੋਨ ਬਾਰੇ"</string>
+    <!-- no translation found for about_settings (6717640957897546887) -->
+    <skip />
     <string name="about_settings" product="emulator" msgid="221313099578564438">"ਇਮੂਲੇਟ ਕੀਤੇ ਡੀਵਾਈਸ ਬਾਰੇ"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"ਕਨੂੰਨੀ ਜਾਣਕਾਰੀ, ਸਥਿਤੀ, ਸਾਫ਼ਟਵੇਅਰ ਵਰਜਨ ਦੇਖੋ"</string>
     <string name="legal_information" msgid="5769301644270604095">"ਕਨੂੰਨੀ ਜਾਣਕਾਰੀ"</string>
@@ -1575,6 +1597,8 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"ਸਾਰੀਆਂ <xliff:g id="COUNT">%1$d</xliff:g> ਐਪਾਂ ਦੇਖੋ"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਅਤੇ ਨਿੱਜੀ ਡਾਟਾ ਅਗਿਆਤ ਐਪਾਂ ਤੋਂ ਹਮਲੇ ਪ੍ਰਤੀ ਵਧੇਰੇ ਕਮਜ਼ੋਰ ਹੈ। ਇਸ ਸਰੋਤ ਤੋਂ ਐਪਾਂ ਸਥਾਪਿਤ ਕਰਕੇ, ਤੁਸੀਂ ਸਹਿਮਤੀ ਦਿੰਦੇ ਹੋ ਕਿ ਆਪਣੇ ਟੈਬਲੈੱਟ ਨੂੰ ਹੋਣ ਵਾਲੇ ਕਿਸੇ ਵੀ ਨੁਕਸਾਨ ਜਾਂ ਡਾਟੇ ਦੇ ਗੁੰਮ ਹੋਣ ਲਈ ਤੁਸੀਂ ਜ਼ਿੰਮੇਵਾਰ ਹੋ, ਜੋ ਸ਼ਾਇਦ ਇਹਨਾਂ ਐਪਾਂ ਨੂੰ ਵਰਤਣ ਦੇ ਨਤੀਜੇ ਵਜੋਂ ਹੋ ਸਕਦਾ ਹੈ।"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਅਤੇ ਨਿੱਜੀ ਡਾਟਾ ਅਗਿਆਤ ਐਪਾਂ ਤੋਂ ਹਮਲੇ ਪ੍ਰਤੀ ਵਧੇਰੇ ਵਿੰਨਣਸ਼ੀਲ ਹਨ। ਇਸ ਸਰੋਤ ਤੋਂ ਐਪਾਂ ਸਥਾਪਤ ਕਰ ਕੇ, ਤੁਸੀਂ ਸਹਿਮਤੀ ਦਿੰਦੇ ਹੋ ਕਿ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਹੋਣ ਵਾਲੇ ਕਿਸੇ ਵੀ ਨੁਕਸਾਨ ਜਾਂ ਡਾਟੇ ਦੇ ਗੁੰਮ ਹੋਣ ਲਈ ਤੁਸੀਂ ਜ਼ਿੰਮੇਵਾਰ ਹੋ ਜੋ ਸ਼ਾਇਦ ਇਹਨਾਂ ਐਪਾਂ ਨੂੰ ਵਰਤਣ ਦੇ ਨਤੀਜੇ ਵਜੋਂ ਹੋ ਸਕਦਾ ਹੈ।"</string>
+    <!-- no translation found for install_all_warning (3648003301476423145) -->
+    <skip />
     <string name="advanced_settings" msgid="1777249286757067969">"ਉੱਨਤ ਸੈਟਿੰਗਾਂ"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"ਹੋਰ ਸੈਟਿੰਗਾਂ ਚੋਣਾਂ ਚਾਲੂ ਕਰੋ"</string>
     <string name="application_info_label" msgid="5736524913065714880">"ਐਪ ਜਾਣਕਾਰੀ"</string>
@@ -1874,6 +1898,12 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"ਪ੍ਰਦਰਸ਼ਨ \'ਤੇ ਅਸਰ ਪਾ ਸਕਦੀ ਹੈ"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"ਪੋਇੰਟਰ ਰੁਕਣ ਤੋਂ ਬਾਅਦ ਕਲਿੱਕ ਕਰੋ"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ਕਲਿੱਕ ਤੋਂ ਪਹਿਲਾਂ ਦੇਰੀ"</string>
+    <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+    <skip />
+    <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+    <skip />
+    <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+    <skip />
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ਚਾਲੂ"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ਬੰਦ"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"ਤਤਕਾਲ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਦਿਖਾਓ"</string>
@@ -2030,14 +2060,37 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਡੀਵਾਈਸ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਰੱਖਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"ਵਾਰ-ਵਾਰ ਟਿਕਾਣੇ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ਐਪਾਂ ਅਜੀਬ ਢੰਗ ਨਾਲ ਵਰਤਾਅ ਕਰ ਰਹੀਆਂ ਹਨ"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"ਬੈਟਰੀ ਚੰਗੀ ਹਾਲਤ ਵਿੱਚ ਹੈ"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"ਐਪਾਂ ਦਾ ਵਤੀਰਾ ਆਮ ਵਾਂਗ ਹੈ"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"ਘੱਟ ਬੈਟਰੀ ਸਮਰੱਥਾ"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"ਬੈਟਰੀ ਜ਼ਿਆਦਾ ਦੇਰ ਤੱਕ ਨਹੀਂ ਚੱਲ ਸਕਦੀ ਹੈ"</string>
+    <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+    <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"ਫ਼ੋਨ ਦੀ ਵਰਤੋਂ ਬਹੁਤ ਜ਼ਿਆਦਾ ਹੋਈ"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"ਟੈਬਲੈੱਟ ਦੀ ਵਰਤੋਂ ਬਹੁਤ ਜ਼ਿਆਦਾ ਹੋਈ"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ ਬਹੁਤ ਜ਼ਿਆਦਾ ਹੋਈ"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਲਗਭਗ <xliff:g id="HOUR">%1$s</xliff:g> ਘੰਟੇ ਵਰਤੋਂ ਹੋਈ"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"ਤੁਹਾਡੇ ਫ਼ੋਨ ਦੀ ਵਰਤੋਂ ਬਹੁਤ ਜ਼ਿਆਦਾ ਹੋਈ ਅਤੇ ਇਸ ਨਾਲ ਬੈਟਰੀ ਦੀ ਕਾਫ਼ੀ ਖਪਤ ਹੋਈ। ਤੁਹਾਡੀ ਬੈਟਰੀ ਦਾ ਵਤੀਰਾ ਆਮ ਵਾਂਗ ਹੈ।\n\n ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਤੁਹਾਡੇ ਫ਼ੋਨ ਦੀ ਲਗਭਗ <xliff:g id="HOUR">%1$s</xliff:g> ਘੰਟੇ ਵਰਤੋਂ ਹੋਈ।\n\n ਕੁੱਲ ਵਰਤੋਂ:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਦੀ ਵਰਤੋਂ ਬਹੁਤ ਜ਼ਿਆਦਾ ਹੋਈ ਅਤੇ ਇਸ ਨਾਲ ਬੈਟਰੀ ਦੀ ਖਪਤ ਕਾਫ਼ੀ ਹੋਈ। ਤੁਹਾਡੀ ਬੈਟਰੀ ਦਾ ਵਤੀਰਾ ਆਮ ਵਾਂਗ ਹੈ।\n\n ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਦੀ ਲਗਭਗ <xliff:g id="HOUR">%1$s</xliff:g> ਘੰਟੇ ਵਰਤੋਂ ਹੋਈ।\n\n ਕੁੱਲ ਵਰਤੋਂ:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ ਬਹੁਤ ਜ਼ਿਆਦਾ ਹੋਈ ਅਤੇ ਇਸ ਨਾਲ ਬੈਟਰੀ ਦੀ ਕਾਫ਼ੀ ਖਪਤ ਹੋਈ। ਤੁਹਾਡੀ ਬੈਟਰੀ ਦਾ ਵਤੀਰਾ ਆਮ ਵਾਂਗ ਹੈ।\n\n ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦੀ ਲਗਭਗ <xliff:g id="HOUR">%1$s</xliff:g> ਘੰਟੇ ਵਰਤੋਂ ਹੋਈ।\n\n ਕੁੱਲ ਵਰਤੋਂ:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"ਸਮਾਰਟ ਬੈਟਰੀ ਪ੍ਰਬੰਧਕ"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"ਸਵੈ-ਪ੍ਰਬੰਧਨ ਬੈਟਰੀ"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"ਵਰਤੋਂ ਦੇ ਆਧਾਰ \'ਤੇ ਐਪਾਂ ਦੀ ਪਾਵਰ ਖਪਤ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"ਪਾਬੰਦੀਸ਼ੁਦਾ ਐਪਾਂ"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="one">%1$d ਐਪ</item>
+      <item quantity="other">%1$d ਐਪਾਂ</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"ਕੀ ਐਪ ਬੰਦ ਕਰੀਏ?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਰੱਖ ਰਹੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਐਪ ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।\n\nਜੇਕਰ ਇੰਝ ਹੋਣਾ ਜਾਰੀ ਰਹਿੰਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਨੂੰ ਬੈਟਰੀ ਪ੍ਰਦਰਸ਼ਨ ਬਿਹਤਰ ਕਰਨ ਲਈ ਐਪ ਨੂੰ ਅਣਸਥਾਪਤ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ।"</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਰੱਖ ਰਹੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਠੀਕ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਐਪ ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।\n\nਜੇਕਰ ਇੰਝ ਹੋਣਾ ਜਾਰੀ ਰਹਿੰਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਨੂੰ ਬੈਟਰੀ ਪ੍ਰਦਰਸ਼ਨ ਬਿਹਤਰ ਕਰਨ ਲਈ ਐਪ ਨੂੰ ਅਣਸਥਾਪਤ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ।"</string>
@@ -2146,6 +2199,8 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"ਐਪ ਅਨੁਕੂਲਨ"</string>
     <string name="battery_saver" msgid="8172485772238572153">"ਬੈਟਰੀ ਸੇਵਰ"</string>
+    <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+    <skip />
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"ਆਪਣੇ-ਆਪ ਚਾਲੂ ਕਰੋ"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"ਕਦੇ ਵੀ ਨਹੀਂ"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> \'ਤੇ ਬੈਟਰੀ"</string>
@@ -2366,6 +2421,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"ਕੀ ਖਾਤਾ ਹਟਾਉਣਾ ਹੈ?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"ਇਸ ਖਾਤੇ ਨੂੰ ਹਟਾਉਣ ਨਾਲ ਇਸਦੇ ਸਾਰੇ ਸੁਨੇਹੇ, ਸੰਪਰਕ ਅਤੇ ਟੈਬਲੈੱਟ ਦਾ ਹੋਰ ਡਾਟਾ ਮਿਟ ਜਾਏਗਾ!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"ਇਸ ਖਾਤੇ ਨੂੰ ਹਟਾਉਣ ਨਾਲ ਇਸਦੇ ਸਾਰੇ ਸੁਨੇਹੇ, ਸੰਪਰਕ ਅਤੇ ਫ਼ੋਨ ਦਾ ਹੋਰ ਡਾਟਾ ਮਿਟ ਜਾਏਗਾ!"</string>
+    <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+    <skip />
     <string name="remove_account_failed" msgid="3901397272647112455">"ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਇਸ ਤਬਦੀਲੀ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
     <string name="provider_label" msgid="7724593781904508866">"Push ਸਬਸਕ੍ਰਿਪਸ਼ੰਸ"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2890,8 +2947,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"ਦ੍ਰਿਸ਼ਟੀਗਤ ਗੜਬੜੀਆਂ ਬਲਾਕ ਕਰੋ"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"ਦ੍ਰਿਸ਼ਟੀਗਤ ਸਿਗਨਲ ਦਿਖਣ ਦਿਓ"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ਹੁਣੇ ਚਾਲੂ ਕਰੋ"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"ਹੁਣੇ ਬੰਦ ਕਰੋ"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"ਹੁਣੇ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"ਹੁਣੇ ਬੰਦ ਕਰੋ"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ਤੱਕ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਮੋਡ ਚਾਲੂ ਹੈ"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਮੋਡ ਨੂੰ ਬੰਦ ਨਹੀਂ ਕਰਦੇ ਇਹ ਚਾਲੂ ਰਹੇਗਾ"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"ਕਿਸੇ ਨਿਯਮ <xliff:g id="RULE_NAME">%s</xliff:g> ਵੱਲੋਂ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਮੋਡ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਕੀਤਾ ਗਿਆ"</string>
@@ -2930,7 +2987,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"ਐਪ ਸੂਚਨਾਵਾਂ"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"ਸੂਚਨਾ ਸ਼੍ਰੇਣੀ"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"ਸੂਚਨਾ ਸ਼੍ਰੇਣੀ ਗਰੁੱਪ"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"ਮਹੱਤਤਾ"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"ਵਰਤਾਅ"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"ਧੁਨੀ ਵੱਜਣ ਦਿਓ"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"ਸੂਚਨਾਵਾਂ ਕਦੇ ਵੀ ਨਾ  ਦਿਖਾਓ"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ਕੋਈ ਧੁਨੀ ਜਾਂ ਦ੍ਰਿਸ਼ਟਾਂਤਕ ਰੁਕਾਵਟ ਨਹੀਂ"</string>
@@ -2948,6 +3005,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"ਔਸਤ ਮਹੱਤਵ"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"ਉੱਚ ਮਹੱਤਵ"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"ਜ਼ਰੂਰੀ ਮਹੱਤਵ"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"ਸੂਚਨਾਵਾਂ ਦਿਖਾਓ"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"ਸੂਚਨਾ ਸਹਾਇਕ"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"ਸੂਚਨਾ ਪਹੁੰਚ"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਸੂਚਨਾਵਾਂ \'ਤੇ ਪਹੁੰਚ ਨੂੰ ਬਲਾਕ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
@@ -2978,9 +3036,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"\"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\" ਤੱਕ ਪਹੁੰਚ"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ਕਿਸੇ ਵੀ ਸਥਾਪਤ ਐਪਾਂ ਨੇ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਪਹੁੰਚ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਕੀਤੀ ਹੈ"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ਐਪਸ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android ਵੱਲੋਂ ਇਸ ਐਪ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਦਿਖਾਏ ਜਾਣ ਤੋਂ ਰੋਕਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android ਵੱਲੋਂ ਸੂਚਨਾਵਾਂ ਦੀ ਇਸ ਸ਼੍ਰੇਣੀ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਦਿਖਾਏ ਜਾਣ ਤੋਂ ਰੋਕਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android ਵੱਲੋਂ ਸੂਚਨਾਵਾਂ ਦੇ ਇਸ ਗਰੁੱਪ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਦਿਖਾਏ ਜਾਣ ਤੋਂ ਬਲਾਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"ਤੁਹਾਡੀ ਬੇਨਤੀ ਕਾਰਨ, Android ਵੱਲੋਂ ਇਸ ਐਪ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਦਿਖਾਏ ਜਾਣ ਤੋਂ ਬਲਾਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"ਤਹਾਡੀ ਬੇਨਤੀ ਕਾਰਨ, Android ਵੱਲੋਂ ਸੂਚਨਾਵਾਂ ਦੀ ਇਸ ਸ਼੍ਰੇਣੀ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਦਿਖਾਏ ਜਾਣ ਤੋਂ ਬਲਾਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"ਤੁਹਾਡੀ ਬੇਨਤੀ ਕਾਰਨ, Android ਵੱਲੋਂ ਸੂਚਨਾਵਾਂ ਦੇ ਇਸ ਗਰੁੱਪ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਦਿਖਾਏ ਜਾਣ ਤੋਂ ਬਲਾਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="notification_channels" msgid="5346841743182627500">"ਸ਼੍ਰੇਣੀਆਂ"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"ਹੋਰ"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3559,31 +3617,10 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"ਇੱਕ ਤੋਂ ਜ਼ਿਆਦਾ ਡੀਵਾਈਸਾਂ ਨਾਲ ਕਨੈਕਟ ਹੈ"</string>
     <string name="demo_mode" msgid="2798762752209330277">"ਸਿਸਟਮ UI ਡੈਮੋ ਮੋਡ"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"ਤਤਕਾਲ ਸੈਟਿੰਗਾਂ ਦੀਆਂ ਵਿਕਾਸਕਾਰ ਟਾਇਲਾਂ"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"ਅਸੀਂ ਮਦਦ ਕਰਨ ਲਈ ਉਪਲਬਧ ਹਾਂ"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"ਅਸੀਂ ਤੁਹਾਡੇ ਲਈ 24/7 ਉਪਲਬਧ ਹਾਂ"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"ਅਸੀਂ ਤੁਹਾਡੇ ਲਈ 24 7 ਉਪਲਬਧ ਹਾਂ"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"ਸਾਡੀ ਸਹਾਇਤਾ ਟੀਮ ਕਿਸੇ ਵੀ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਵਿੱਚ ਮਦਦ ਲਈ ਉਪਲਬਧ ਹੈ"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"ਸਾਡੀ ਸਹਾਇਤਾ ਟੀਮ ਹਰ ਵੇਲੇ, ਹਰ ਦਿਨ ਉਪਲਬਧ ਹੈ।"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"ਮਦਦ ਖੋਜੋ ਜਾਂ ਸਹਾਇਤਾ ਸਮੇਂ ਦੌਰਾਨ ਵਾਪਸ ਆਓ (ਸਥਾਨਕ ਸਮਾਂ):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"ਫ਼ੋਨ ਰਾਹੀਂ ਸਹਾਇਤਾ ਦਾ ਸਮਾਂ (ਸਥਾਨਕ ਸਮਾਂ)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"ਮਦਦ ਖੋਜੋ ਜਾਂ ਨੁਕਤਿਆਂ ਅਤੇ ਜੁਗਤਾਂ ਦੀ ਪੜਚੋਲ ਕਰੋ"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"ਇਸ ਲਈ ਸਹਾਇਤਾ:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"ਕੀ ਵਿਦੇਸ਼ ਯਾਤਰਾ ਕਰ ਰਹੇ ਹੋ?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"ਅੰਤਰਰਾਸ਼ਟਰੀ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"ਫ਼ੋਨ ਕਰੋ"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"ਚੈਟ ਕਰੋ"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"ਨੁਕਤਿਆਂ ਅਤੇ ਜੁਗਤਾਂਂ ਦੀ ਪੜਚੋਲ ਕਰੋ"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"ਮਦਦ ਖੋਜੋ ਅਤੇ ਵਿਚਾਰ ਭੇਜੋ"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"ਸਹਾਇਤਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"ਸਾਈਨ-ਇਨ ਕਰੋ"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"ਕੀ ਸਾਈਨ-ਇਨ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"ਸਿਸਟਮ ਜਾਣਕਾਰੀ ਭੇਜੋ"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"ਦੁਬਾਰਾ ਨਾ  ਦਿਖਾਓ"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"ਇਸ ਵਜੋਂ ਬੇਨਤੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"ਖਾਤਾ ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"ਸਿਸਟਮ ਜਾਣਕਾਰੀ"</string>
+    <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+    <skip />
+    <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+    <skip />
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਸੈਟਿੰਗਾਂ"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"ਸੰਪਰਕ ਖੋਜ"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"ਕਾਲ ਕਰਨ ਵਾਲਿਆਂ ਅਤੇ ਸੰਪਰਕਾਂ ਦੀ ਪਛਾਣ ਕਰਨ ਲਈ ਤੁਹਾਡੀ ਸੰਸਥਾ ਵਿੱੱਚ ਸੰਪਰਕ ਖੋਜਾਂ ਕਰਨ ਦਿਓ"</string>
@@ -3599,11 +3636,12 @@
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> ਸਕਿੰਟ</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ਸਕਿੰਟ</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> ਉਡੀਕ ਕਰੋ"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"ਸਟੋਰੇਜ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"ਸਟੋਰੇਜ ਦੀ ਜਗ੍ਹਾ ਖਾਲੀ ਕਰਨ ਵਿੱਚ ਮਦਦ ਲਈ, ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਤੋਂ ਬੈਕਅੱਪ ਲਈਆਂ ਗਈਆਂ ਫ਼ੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ ਹਟਾਉਂਦਾ ਹੈ।"</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ਫੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ ਹਟਾਓ"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ"</string>
+    <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+    <skip />
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"ਸਵੈਚਾਲਿਤ"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"ਦਸਤੀ"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"ਹੁਣੇ ਜਗ੍ਹਾ ਖਾਲੀ ਕਰੋ"</string>
@@ -3769,8 +3807,10 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ਆਪਣਾ ਨਵਾਂ ਟੈਬਲੈੱਟ ਵਰਤਣ ਬਾਰੇ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Take a tour of your new device"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"ਪੂਰੇ GNSS ਮਾਪ ਜ਼ਬਰਦਰਸਤੀ ਲਾਗੂ ਕਰੋ"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"ਡਿਊਟੀ ਸਾਈਕਲਿੰਗ ਤੋਂ ਬਿਨਾਂ ਸਾਰੇ GNSS ਉਪਗ੍ਰਹਿ ਗਰੁੱਪਾਂ ਅਤੇ ਵਾਰਵਾਰਤਾਵਾਂ ਨੂੰ ਟਰੈਕ ਕਰੋ"</string>
+    <!-- no translation found for storage_access (8905018810338984531) -->
     <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+    <!-- no translation found for keywords_storage_access (3708874088152933579) -->
     <skip />
 </resources>
diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml
index 3c5a7ca..4fc4761 100644
--- a/res/values-pt-rBR/arrays.xml
+++ b/res/values-pt-rBR/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Ruim"</item>
     <item msgid="2042505933058940139">"Fraca"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"Com mais de 60 dias"</item>
     <item msgid="5692284879054004388">"Com mais de 90 dias"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"Usar preferência de rede"</item>
+    <item msgid="8745603368609022803">"Tratar como limitada"</item>
+    <item msgid="2266114985518865625">"Tratar como ilimitada"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 9c2a2f7..40005bb 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Seus dispositivos"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Parear novo dispositivo"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"Permitir que o dispositivo pareie e se conecte a dispositivos Bluetooth"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Desativar o toque em banda"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Não reproduzir toques de telefone personalizados em fones de ouvido Bluetooth"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Conectados no momento"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"Dispositivos salvos"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"Adicionar dispositivo"</string>
@@ -330,6 +332,11 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"Definir data"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Classificar em ordem alfabética"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Classificar por fuso horário"</string>
+    <string name="zone_change_to_from_dst" msgid="118656001224045590">"O <xliff:g id="TIME_TYPE">%1$s</xliff:g> começa em: <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+    <string name="zone_time_type_dst" msgid="8850494578766845276">"Horário de verão"</string>
+    <string name="zone_time_type_standard" msgid="3462424485380376522">"Horário padrão"</string>
+    <string name="zone_menu_by_region" msgid="4603214570803607532">"Fuso horário por região"</string>
+    <string name="zone_menu_by_offset" msgid="1172774718486088771">"Fusos horários com diferença fixa"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Bloquear automaticamente"</string>
@@ -348,6 +355,7 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Informação do perfil"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Contas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Localização"</string>
+    <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Usar local"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"Segurança e local"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Criptografia e credenciais"</string>
@@ -691,6 +699,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como viva-voz"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música e mídia"</string>
     <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="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>
@@ -705,6 +715,7 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nome"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Fazer login"</string>
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> quer ativar o Wi-Fi"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> quer desativar o Wi-Fi"</string>
@@ -722,6 +733,7 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Ativar o Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Usar Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="8719175790520448014">"Configurações de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurar e gerenciar pontos de acesso sem fio"</string>
@@ -833,7 +845,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Insira a senha da rede"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"Rede Wi‑Fi de operadora"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"Conecte-se via <xliff:g id="NAME">%1%s</xliff:g>"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Conecte-se via <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para aumentar a precisão da localização e outras finalidades, <xliff:g id="APP_NAME">%1$s</xliff:g> quer ativar a verificação de rede, mesmo que o Wi-Fi esteja desligado.\n\nPermitir isto para todos os apps que quiserem verificar?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Para desativar esta opção, vá para \"Avançado\" no menu flutuante."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -909,10 +921,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda de AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Use o ponto de acesso para criar uma rede Wi‑Fi para outros dispositivos. O ponto de acesso fornece Internet usando sua conexão de dados móveis. Pode haver cobrança adicional para dados móveis."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Os apps podem criar um ponto de acesso para compartilhamento de conteúdo com dispositivos nas proximidades."</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Desativar ponto de acesso automaticamente"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"O ponto de acesso Wi‑Fi será desativado se nenhum dispositivo for conectado"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Ativando o ponto de acesso..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Desativando o ponto de acesso..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"A rede <xliff:g id="NETWORK_SSID">%1$s</xliff:g> está ativa"</string>
@@ -961,6 +971,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"Endereço de emergência"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Usado como seu local quando você faz uma chamada de emergência usando o Wi‑Fi"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Saiba mais"</annotation>" sobre recursos de DNS particular"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tela"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -1308,6 +1319,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Seu novo <xliff:g id="NAME">^1</xliff:g> está funcionando. \n\nPara mover fotos, arquivos e dados de apps para este dispositivo, vá para \"Config.\" &gt; \"Armazenamento\"."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Mover <xliff:g id="APP">^1</xliff:g>"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"A transferência de <xliff:g id="APP">^1</xliff:g> e seus dados para <xliff:g id="NAME_0">^2</xliff:g> levará apenas alguns momentos. Você não conseguirá usar o app até que a transferência seja concluída. \n\nNão remova o <xliff:g id="NAME_1">^2</xliff:g> durante a transferência."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Para mover os dados é necessário desbloquear o usuário <xliff:g id="APP">^1</xliff:g>."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Movendo <xliff:g id="APP">^1</xliff:g>…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Não remova o <xliff:g id="NAME">^1</xliff:g> durante a transferência. \n\nO app <xliff:g id="APP">^2</xliff:g> deste dispositivo não ficará disponível até a conclusão da transferência."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancelar transferência"</string>
@@ -1468,6 +1480,7 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"Fontes de localização"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Sobre o tablet"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Sobre o dispositivo"</string>
+    <string name="about_settings" product="device" msgid="6717640957897546887">"Sobre o dispositivo"</string>
     <string name="about_settings" product="emulator" msgid="221313099578564438">"Sobre o dispositivo emulado"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Ver informações legais, status, versão do software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informações legais"</string>
@@ -1575,6 +1588,7 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"Ver todos os <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Seu tablet e seus dados pessoais estão mais vulneráveis a ataques de apps desconhecidos. Ao instalar apps dessa fonte, você concorda que é responsável por qualquer dano causado ao seu tablet ou pela perda de dados que possa resultar do uso desses apps."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Seu smartphone e seus dados pessoais estão mais vulneráveis a ataques de apps desconhecidos. Ao instalar apps dessa fonte, você concorda que é responsável por qualquer dano causado ao seu smartphone ou pela perda de dados que possa resultar do uso desses apps."</string>
+    <string name="install_all_warning" product="device" msgid="3648003301476423145">"Seus dados pessoais e do seu dispositivo são mais vulneráveis a ataques de apps desconhecidos. Ao instalar apps dessa fonte, você concorda que é responsável por qualquer dano causado ao seu dispositivo ou pela perda de dados que possa resultar do uso desses apps."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Configurações avançadas"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Ativa mais opções de configuração"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informações do app"</string>
@@ -1874,6 +1888,9 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Pode afetar o desempenho"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clicar após parada do ponteiro"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Atraso antes do clique"</string>
+    <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="enable_quick_setting" msgid="2366999897816894536">"Mostrar em \"Configurações rápidas\""</string>
@@ -2030,14 +2047,35 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Ativando o dispositivo em segundo plano"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Solicitando localização com frequência"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps não estão funcionando bem"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"A bateria está em boas condições"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Os apps estão se comportando normalmente"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Baixa capacidade de bateria"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"A bateria não pode oferecer uma boa duração"</string>
+    <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Ativar o gerenciador de bateria inteligente"</string>
+    <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Ative para otimizar o uso da bateria"</string>
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
     <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"O smartphone foi muito usado"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"O tablet foi muito usado"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"O dispositivo foi muito usado"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Cerca de <xliff:g id="HOUR">%1$s</xliff:g> de uso desde a última carga completa"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Seu smartphone foi muito usado, e isso consumiu muita bateria. A bateria está se comportando normalmente.\n\n O smartphone foi usado por cerca de <xliff:g id="HOUR">%1$s</xliff:g> desde a última carga completa.\n\n Uso total:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Seu tablet foi muito usado, e isso consumiu muita bateria. A bateria está se comportando normalmente.\n\n O tablet foi usado por cerca de <xliff:g id="HOUR">%1$s</xliff:g> desde a última carga completa.\n\n Uso total:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Seu dispositivo foi muito usado, e isso consumiu muita bateria. A bateria está se comportando normalmente.\n\n O dispositivo foi usado por cerca de <xliff:g id="HOUR">%1$s</xliff:g> desde a última carga completa.\n\n Uso total:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"Gerenciador de bateria inteligente"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"Gerenciar bateria automaticamente"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"Ajuste automaticamente o consumo de energia de apps com base no uso"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"Apps restritos"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="one">%1$d app</item>
+      <item quantity="other">%1$d apps</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"Parar o app?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Não é possível gerenciar a bateria do smartphone normalmente, porque o app <xliff:g id="APP">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, você pode forçar a parada do app.\n\nSe isso continuar acontecendo, talvez seja necessário desinstalá-lo para melhorar o desempenho da bateria."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Não é possível gerenciar a bateria do tablet normalmente, porque o app <xliff:g id="APP">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, você pode forçar a parada do app.\n\nSe isso continuar acontecendo, talvez seja necessário desinstalá-lo para melhorar o desempenho da bateria."</string>
@@ -2146,6 +2184,7 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Servidor de mídia"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Otimização do app"</string>
     <string name="battery_saver" msgid="8172485772238572153">"Economia de bateria"</string>
+    <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Usar a Economia de bateria"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Ativar automaticamente"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nunca"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"com <xliff:g id="PERCENT">%1$s</xliff:g> de bateria"</string>
@@ -2366,6 +2405,7 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"Remover conta?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"A remoção desta conta excluirá todas as suas mensagens, contatos e outros dados do tablet."</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"A remoção desta conta excluirá todas as suas mensagens, contatos e outros dados do telefone!"</string>
+    <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"A remoção desta conta excluirá do dispositivo todas as mensagens, os contatos e outros dados dela."</string>
     <string name="remove_account_failed" msgid="3901397272647112455">"Esta alteração não é permitida pelo administrador"</string>
     <string name="provider_label" msgid="7724593781904508866">"Enviar inscrições"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2890,8 +2930,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Bloquear perturbações visuais"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permitir sinais visuais"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"Adicionar"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ATIVAR AGORA"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"DESATIVAR AGORA"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Ativar agora"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Desativar agora"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"O modo \"Não perturbe\" fica ativado até <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"O modo \"Não perturbe\" ficará ativado até que você o desative"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"O modo \"Não perturbe\" foi ativado automaticamente por uma regra (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
@@ -2930,7 +2970,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificações de apps"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoria da notificação"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"Grupo de categoria de notificações"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"Importância"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"Comportamento"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"Permitir som"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nunca mostrar notificações"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Sem som ou interrupção visual"</string>
@@ -2948,6 +2988,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Importância média"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importância elevada"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"Importância urgente"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"Mostrar notificações"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Assistente de notificação"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Acesso a notificações"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"O acesso às notificações do perfil de trabalho está bloqueado"</string>
@@ -2978,9 +3019,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acesso \"Não perturbe\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nenhum app instalado solicitou o acesso \"Não perturbe\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Carregando apps…"</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"O Android está impedindo que as notificações desse app sejam exibidas neste dispositivo"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"O Android está impedindo que essa categoria de notificações seja exibida neste dispositivo"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"O Android está impedindo que esse grupo de notificações seja exibido neste dispositivo"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"Conforme sua solicitação, o Android está impedindo que as notificações desse app sejam exibidas neste dispositivo"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Conforme sua solicitação, o Android está impedindo que essa categoria de notificações seja exibida neste dispositivo"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Conforme sua solicitação, o Android está impedindo que esse grupo de notificações seja exibido neste dispositivo"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categorias"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Outros"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3559,31 +3600,8 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"Blocos de desenvolvedor para configurações rápidas"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"Estamos aqui para ajudar"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Estamos aqui para ajudar você 24 horas por dia, 7 dias por semana"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Estamos aqui para ajudar você 24 horas por dia, 7 dias por semana"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"Nossa equipe de suporte está aqui para ajudar a resolver qualquer problema"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Nossa equipe de suporte está disponível o dia todo, todos os dias"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Procure ajuda ou volte durante o horário de suporte (hora local):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Horário do suporte por telefone (hora local)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Procure ajuda ou explore dicas e truques"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"Suporte para:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"Está no exterior?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"Tarifas internacionais podem ser aplicadas"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefone"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"Bate-papo"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Conferir dicas e truques"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Procurar ajuda e enviar feedback"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"Entre em contato com o suporte"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Fazer login"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"Não consegue fazer login?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"Enviar informações do sistema"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Não mostrar novamente"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"Solicitando como"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"Adicionar conta"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"Informações do sistema"</string>
+    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Rastros da janela"</string>
+    <string name="layer_trace_quick_settings_title" msgid="2447147947568109649">"Rastros da camada"</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>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Permitir que sua organização pesquise contatos para identificar autores de chamadas e contatos"</string>
@@ -3599,11 +3617,11 @@
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Tempo aproximado de espera: <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Gerenciar armazenamento"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Para ajudar a liberar espaço de armazenamento, o gerenciador de armazenamento remove fotos e vídeos do seu dispositivo salvos em backup."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Remover fotos e vídeos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Gerenciador de armazenamento"</string>
+    <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Usar gerenciador de armazenamento"</string>
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Modo automático"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Modo manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Liberar espaço agora"</string>
@@ -3769,8 +3787,8 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faça um tour pelo seu novo tablet"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Faça um tour pelo seu novo dispositivo"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Este recurso não está disponível neste dispositivo"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
-    <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
-    <skip />
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forçar medições completas de GNSS"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Rastrear todas as constelações e frequências do GNSS sem nenhum ciclo de trabalho"</string>
+    <string name="storage_access" msgid="8905018810338984531">"Acesso ao armazenamento"</string>
+    <string name="keywords_storage_access" msgid="3708874088152933579">"armazenamento acesso diretório com foco"</string>
 </resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 9df255c..1240ebe 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Fraco"</item>
     <item msgid="2042505933058940139">"Fraca"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"Mais de 60 dias"</item>
     <item msgid="5692284879054004388">"Mais de 90 dias"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"Utilizar preferência da rede"</item>
+    <item msgid="8745603368609022803">"Tratar como acesso limitado"</item>
+    <item msgid="2266114985518865625">"Tratar como acesso ilimitado"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index d9546f1..d469602 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Os seus dispositivos"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Sincronizar o novo dispositivo"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"Permitir que o dispositivo estabeleça ligação a dispositivos Bluetooth e fique sincronizado com os mesmos"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Desativar toque dentro da banda"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Não reproduza toques de telemóvel personalizados em auscultadores com microfone integrado Bluetooth."</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Ligado atualmente"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"Dispositivos guardados"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"Adicionar dispositivo"</string>
@@ -330,6 +332,11 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"Definir data"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordenar alfabeticamente"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordenar por fuso horário"</string>
+    <string name="zone_change_to_from_dst" msgid="118656001224045590">"O horário <xliff:g id="TIME_TYPE">%1$s</xliff:g> começa a <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+    <string name="zone_time_type_dst" msgid="8850494578766845276">"Mudança de hora"</string>
+    <string name="zone_time_type_standard" msgid="3462424485380376522">"Hora padrão"</string>
+    <string name="zone_menu_by_region" msgid="4603214570803607532">"Fuso horário por região"</string>
+    <string name="zone_menu_by_offset" msgid="1172774718486088771">"Fusos horários com desvio fixo"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Bloquear automaticamente"</string>
@@ -348,6 +355,7 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Informação do perfil"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Contas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Localização"</string>
+    <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Utilizar a localização"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"Segurança e localização"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encriptação e credenciais"</string>
@@ -691,6 +699,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como telefone com altifalante"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música e multimédia"</string>
     <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="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>
@@ -705,6 +715,7 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nome"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Iniciar sessão"</string>
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> pretende ativar o Wi-Fi"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> pretende desativar o Wi-Fi"</string>
@@ -722,6 +733,7 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Ativar Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Utilizar o Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="8719175790520448014">"Definições de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurar e gerir pontos de acesso sem fios"</string>
@@ -833,7 +845,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduzir a palavra-passe da rede"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"Rede Wi-Fi do operador"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"Ligar através de <xliff:g id="NAME">%1%s</xliff:g>"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Ligar através de <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para melhorar a precisão da localização e para outros fins, <xliff:g id="APP_NAME">%1$s</xliff:g> pretende ativar a verificação de redes, mesmo quando o Wi-Fi está desativado.\n\nPermitir esta opção para todas as aplicações que pretenderem verificar?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Para desativar, aceda a Avançadas no menu adicional."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -959,6 +971,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"Endereço de emergência"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Utilizado como a sua localização quando efetuar chamadas de emergência através de Wi‑Fi."</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Saiba mais"</annotation>" acerca das funcionalidades de DNS privado."</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ecrã"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -1306,6 +1319,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"O seu novo <xliff:g id="NAME">^1</xliff:g> está a funcionar. \n\nPara mover fotos, ficheiros e dados das aplicações para este dispositivo, aceda a Definições &gt; Armazenamento."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Mover <xliff:g id="APP">^1</xliff:g>"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"A transferência da aplicação <xliff:g id="APP">^1</xliff:g> e dos respetivos dados para <xliff:g id="NAME_0">^2</xliff:g> demora apenas alguns minutos. Não é possível utilizar a aplicação até a ação terminar. \n\nNão remova o <xliff:g id="NAME_1">^2</xliff:g> no decorrer da mesma."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Para mover os dados, tem de desbloquear o utilizador <xliff:g id="APP">^1</xliff:g>."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"A mover <xliff:g id="APP">^1</xliff:g>…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Não remova o <xliff:g id="NAME">^1</xliff:g> durante a transferência. \n\nA aplicação <xliff:g id="APP">^2</xliff:g> neste dispositivo não está disponível até terminar a transferência."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancelar transferência"</string>
@@ -1466,6 +1480,7 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"Origens da localização"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Acerca do tablet"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Acerca do telefone"</string>
+    <string name="about_settings" product="device" msgid="6717640957897546887">"Acerca do dispositivo"</string>
     <string name="about_settings" product="emulator" msgid="221313099578564438">"Acerca do dispositivo emulado"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Ver informações jurídicas, estado, versão de software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informações legais"</string>
@@ -1573,6 +1588,7 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"Ver as <xliff:g id="COUNT">%1$d</xliff:g> aplicações"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"O seu tablet e os dados pessoais são mais vulneráveis a ataques de aplicações desconhecidas. Ao instalar aplicações desta fonte, aceita ser responsável por quaisquer danos no tablet ou perdas de dados que possam resultar da utilização do mesmo."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"O seu telemóvel e os dados pessoais são mais vulneráveis a ataques de aplicações desconhecidas. Ao instalar aplicações desta fonte, aceita ser responsável por quaisquer danos no telemóvel ou perdas de dados que possam resultar da utilização do mesmo."</string>
+    <string name="install_all_warning" product="device" msgid="3648003301476423145">"O dispositivo e os dados pessoais são mais vulneráveis a ataques de aplicações desconhecidas. Ao instalar aplicações desta fonte, aceita ser responsável por quaisquer danos no dispositivo ou perdas de dados que possam resultar da utilização do mesmo."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Definições avançadas"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Ativar mais opções de definições"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informações da aplicação"</string>
@@ -1872,6 +1888,9 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Pode afetar o desempenho"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clicar depois de o ponteiro parar de se mover"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Atraso antes de clicar"</string>
+    <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="enable_quick_setting" msgid="2366999897816894536">"Mostrar nas Definições rápidas"</string>
@@ -2030,10 +2049,33 @@
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplicações que não estão a funcionar corretamente"</string>
     <string name="battery_tip_summary_title" msgid="7060523369832289878">"A bateria não apresenta problemas"</string>
     <string name="battery_tip_summary_summary" msgid="7832491466325707487">"As aplicações estão a apresentar um comportamento normal."</string>
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Bateria fraca"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Bateria com baixa autonomia"</string>
+    <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Ativar o gestor de bateria inteligente"</string>
+    <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Ative para otimizar a utilização da bateria."</string>
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+    <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Telemóvel submetido a uma utilização intensa"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Tablet submetido a uma utilização intensa"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Dispositivo submetido a uma utilização intensa"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Cerca de <xliff:g id="HOUR">%1$s</xliff:g> de utilização desde o último carregamento completo."</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"O seu telemóvel foi submetido a uma utilização intensa, o que consumiu muita bateria. A bateria apresenta um comportamento normal.\n\n O telemóvel foi utilizado durante cerca de <xliff:g id="HOUR">%1$s</xliff:g> desde o último carregamento completo.\n\n Utilização total:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"O seu tablet foi submetido a uma utilização intensa, o que consumiu muita bateria. A bateria apresenta um comportamento normal.\n\n O tablet foi utilizado durante cerca de <xliff:g id="HOUR">%1$s</xliff:g> desde o último carregamento completo.\n\n Utilização total:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"O seu dispositivo foi submetido a uma utilização intensa, o que consumiu muita bateria. A bateria apresenta um comportamento normal.\n\n O dispositivo foi utilizado durante cerca de <xliff:g id="HOUR">%1$s</xliff:g> desde o último carregamento completo.\n\n Utilização total:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"Gestor de bateria inteligente"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"Gerir automaticamente a bateria"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"Ajuste automaticamente o consumo de energia das aplicações com base na utilização."</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"Aplicações restritas"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="other">%1$d aplicações</item>
+      <item quantity="one">%1$d aplicação</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"Parar a aplicação?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"O telemóvel não consegue gerir a bateria normalmente, pois a aplicação <xliff:g id="APP">%1$s</xliff:g> mantém-no constantemente ativo.\n\nPara tentar resolver este problema, pode parar a aplicação.\n\nSe isto continuar a acontecer, pode ser necessário desinstalar a aplicação para melhorar o desempenho da bateria."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"O tablet não consegue gerir a bateria normalmente, pois a aplicação <xliff:g id="APP">%1$s</xliff:g> mantém-no constantemente ativo.\n\nPara tentar resolver este problema, pode parar a aplicação.\n\nSe isto continuar a acontecer, pode ser necessário desinstalar a aplicação para melhorar o desempenho da bateria."</string>
@@ -2142,6 +2184,7 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Otimização de aplicações"</string>
     <string name="battery_saver" msgid="8172485772238572153">"Poupança de bateria"</string>
+    <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Utilizar a Poupança de bateria"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Ligar automaticamente"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nunca"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"ao alcançar <xliff:g id="PERCENT">%1$s</xliff:g> de bateria"</string>
@@ -2362,6 +2405,7 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"Pretende remover a conta?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"A remoção desta conta elimina todas as mensagens, contactos e outros dados do tablet!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"A remoção desta conta elimina todas as mensagens, contactos e outros dados do telemóvel!"</string>
+    <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"A remoção desta conta elimina todas as mensagens, os contactos e outros dados do dispositivo."</string>
     <string name="remove_account_failed" msgid="3901397272647112455">"O gestor não permite esta alteração"</string>
     <string name="provider_label" msgid="7724593781904508866">"Subscrições de emissão"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2886,8 +2930,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Bloquear perturbações visuais"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permitir sinais visuais"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"Adicionar"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ATIVAR AGORA"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"DESATIVAR AGORA"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Ativar agora"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Desativar agora"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"O modo Não incomodar está ativado até à(s) <xliff:g id="FORMATTED_TIME">%s</xliff:g>."</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"O modo Não incomodar continua ativo até o desativar."</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"O modo Não incomodar foi ativado automaticamente por uma regra (<xliff:g id="RULE_NAME">%s</xliff:g>)."</string>
@@ -2926,7 +2970,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificações de aplicações"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoria de notificações"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"Grupo de categoria de notificações"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"Importância"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"Comportamento"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"Permitir som"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nunca mostrar notificações"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Sem interrupção sonora ou visual"</string>
@@ -2944,6 +2988,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Importância média"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importância alta"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"Importância máxima"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"Mostrar notificações"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Assistente de notificações"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Acesso a notificações"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"O acesso às notificações do perfil de trabalho está bloqueado"</string>
@@ -2974,9 +3019,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acesso Não incomodar"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nenhuma aplicação instalada solicitou acesso Não incomodar"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"A carregar aplicações..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"O Android está a bloquear a apresentação das notificações desta aplicação neste dispositivo"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"O Android está a bloquear a apresentação desta categoria de notificações neste dispositivo"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"O Android está a bloquear a apresentação deste grupo de notificações neste dispositivo."</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"A seu pedido, o Android está a bloquear a apresentação das notificações desta aplicação neste dispositivo."</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"A seu pedido, o Android está a bloquear a apresentação desta categoria de notificações neste dispositivo."</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"A seu pedido, o Android está a bloquear a apresentação deste grupo de notificações neste dispositivo."</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categorias"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Outra"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3555,31 +3600,8 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"Mosaicos de definições rápidas do programador"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"Estamos aqui para ajudar"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Estamos disponíveis 24 horas por dia, 7 dias por semana"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Estamos disponíveis 24 horas por dia, 7 dias por semana"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"A nossa equipa de apoio técnico está disponível para ajudar a resolver qualquer problema"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"A nossa equipa de apoio técnico está disponível o dia todo, todos os dias"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Pesquise na ajuda ou contacte-nos mais tarde, durante o horário de funcionamento do apoio técnico (hora local):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Horário de atendimento telefónico (hora local)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Procure ajuda ou explore sugestões e truques"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"Compatibilidade para:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"Vai viajar para o estrangeiro?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"Podem aplicar-se custos internacionais"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telemóvel"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"Mensagem de chat"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Explorar sugestões e dicas"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Procurar ajuda e enviar comentários"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"Contactar o apoio técnico"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Iniciar sessão"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"Não consegue iniciar sessão?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"Enviar informações do sistema"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Não mostrar novamente"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"A solicitar como"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"Adicionar conta"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"Informações do sistema"</string>
+    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Window Trace"</string>
+    <string name="layer_trace_quick_settings_title" msgid="2447147947568109649">"Layer Trace"</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>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Permitir pesquisa de contactos por parte da sua entidade para identificar autores das chamadas e contactos"</string>
@@ -3595,11 +3617,11 @@
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
       <item quantity="one">1 segundo</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Tempo de espera de ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Gerir o armazenamento"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Para ajudar a libertar espaço de armazenamento, o gestor de armazenamento remove cópias de segurança de fotos e vídeos do dispositivo."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Remover fotos e vídeos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Gestor de armazenamento"</string>
+    <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Utilizar o Gestor de armazenamento"</string>
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automático"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Libertar espaço agora"</string>
@@ -3765,8 +3787,8 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faça uma visita guiada ao seu novo tablet"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Faça uma visita guiada ao seu novo dispositivo"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Esta funcionalidade não está disponível neste dispositivo."</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
-    <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
-    <skip />
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forçar medições de GNSS completas"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Monitorizar todas as constelações e frequências de GNSS sem ciclos"</string>
+    <string name="storage_access" msgid="8905018810338984531">"Acesso ao armazenamento"</string>
+    <string name="keywords_storage_access" msgid="3708874088152933579">"acesso ao armazenamento diretório limitado"</string>
 </resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 3c5a7ca..4fc4761 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Ruim"</item>
     <item msgid="2042505933058940139">"Fraca"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"Com mais de 60 dias"</item>
     <item msgid="5692284879054004388">"Com mais de 90 dias"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"Usar preferência de rede"</item>
+    <item msgid="8745603368609022803">"Tratar como limitada"</item>
+    <item msgid="2266114985518865625">"Tratar como ilimitada"</item>
+  </string-array>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 9c2a2f7..40005bb 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Seus dispositivos"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Parear novo dispositivo"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"Permitir que o dispositivo pareie e se conecte a dispositivos Bluetooth"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Desativar o toque em banda"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Não reproduzir toques de telefone personalizados em fones de ouvido Bluetooth"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Conectados no momento"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"Dispositivos salvos"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"Adicionar dispositivo"</string>
@@ -330,6 +332,11 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"Definir data"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Classificar em ordem alfabética"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Classificar por fuso horário"</string>
+    <string name="zone_change_to_from_dst" msgid="118656001224045590">"O <xliff:g id="TIME_TYPE">%1$s</xliff:g> começa em: <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+    <string name="zone_time_type_dst" msgid="8850494578766845276">"Horário de verão"</string>
+    <string name="zone_time_type_standard" msgid="3462424485380376522">"Horário padrão"</string>
+    <string name="zone_menu_by_region" msgid="4603214570803607532">"Fuso horário por região"</string>
+    <string name="zone_menu_by_offset" msgid="1172774718486088771">"Fusos horários com diferença fixa"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Hora"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Bloquear automaticamente"</string>
@@ -348,6 +355,7 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Informação do perfil"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Contas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Localização"</string>
+    <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Usar local"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"Segurança e local"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Criptografia e credenciais"</string>
@@ -691,6 +699,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Como viva-voz"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Para música e mídia"</string>
     <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="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>
@@ -705,6 +715,7 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nome"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Fazer login"</string>
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> quer ativar o Wi-Fi"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> quer desativar o Wi-Fi"</string>
@@ -722,6 +733,7 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Ativar o Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Usar Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="8719175790520448014">"Configurações de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurar e gerenciar pontos de acesso sem fio"</string>
@@ -833,7 +845,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Insira a senha da rede"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"Rede Wi‑Fi de operadora"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"Conecte-se via <xliff:g id="NAME">%1%s</xliff:g>"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Conecte-se via <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para aumentar a precisão da localização e outras finalidades, <xliff:g id="APP_NAME">%1$s</xliff:g> quer ativar a verificação de rede, mesmo que o Wi-Fi esteja desligado.\n\nPermitir isto para todos os apps que quiserem verificar?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Para desativar esta opção, vá para \"Avançado\" no menu flutuante."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -909,10 +921,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda de AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Use o ponto de acesso para criar uma rede Wi‑Fi para outros dispositivos. O ponto de acesso fornece Internet usando sua conexão de dados móveis. Pode haver cobrança adicional para dados móveis."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Os apps podem criar um ponto de acesso para compartilhamento de conteúdo com dispositivos nas proximidades."</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Desativar ponto de acesso automaticamente"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"O ponto de acesso Wi‑Fi será desativado se nenhum dispositivo for conectado"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Ativando o ponto de acesso..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Desativando o ponto de acesso..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"A rede <xliff:g id="NETWORK_SSID">%1$s</xliff:g> está ativa"</string>
@@ -961,6 +971,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"Endereço de emergência"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Usado como seu local quando você faz uma chamada de emergência usando o Wi‑Fi"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Saiba mais"</annotation>" sobre recursos de DNS particular"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tela"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -1308,6 +1319,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Seu novo <xliff:g id="NAME">^1</xliff:g> está funcionando. \n\nPara mover fotos, arquivos e dados de apps para este dispositivo, vá para \"Config.\" &gt; \"Armazenamento\"."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Mover <xliff:g id="APP">^1</xliff:g>"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"A transferência de <xliff:g id="APP">^1</xliff:g> e seus dados para <xliff:g id="NAME_0">^2</xliff:g> levará apenas alguns momentos. Você não conseguirá usar o app até que a transferência seja concluída. \n\nNão remova o <xliff:g id="NAME_1">^2</xliff:g> durante a transferência."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Para mover os dados é necessário desbloquear o usuário <xliff:g id="APP">^1</xliff:g>."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Movendo <xliff:g id="APP">^1</xliff:g>…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Não remova o <xliff:g id="NAME">^1</xliff:g> durante a transferência. \n\nO app <xliff:g id="APP">^2</xliff:g> deste dispositivo não ficará disponível até a conclusão da transferência."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Cancelar transferência"</string>
@@ -1468,6 +1480,7 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"Fontes de localização"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Sobre o tablet"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Sobre o dispositivo"</string>
+    <string name="about_settings" product="device" msgid="6717640957897546887">"Sobre o dispositivo"</string>
     <string name="about_settings" product="emulator" msgid="221313099578564438">"Sobre o dispositivo emulado"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Ver informações legais, status, versão do software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informações legais"</string>
@@ -1575,6 +1588,7 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"Ver todos os <xliff:g id="COUNT">%1$d</xliff:g> apps"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Seu tablet e seus dados pessoais estão mais vulneráveis a ataques de apps desconhecidos. Ao instalar apps dessa fonte, você concorda que é responsável por qualquer dano causado ao seu tablet ou pela perda de dados que possa resultar do uso desses apps."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Seu smartphone e seus dados pessoais estão mais vulneráveis a ataques de apps desconhecidos. Ao instalar apps dessa fonte, você concorda que é responsável por qualquer dano causado ao seu smartphone ou pela perda de dados que possa resultar do uso desses apps."</string>
+    <string name="install_all_warning" product="device" msgid="3648003301476423145">"Seus dados pessoais e do seu dispositivo são mais vulneráveis a ataques de apps desconhecidos. Ao instalar apps dessa fonte, você concorda que é responsável por qualquer dano causado ao seu dispositivo ou pela perda de dados que possa resultar do uso desses apps."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Configurações avançadas"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Ativa mais opções de configuração"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informações do app"</string>
@@ -1874,6 +1888,9 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Pode afetar o desempenho"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clicar após parada do ponteiro"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Atraso antes do clique"</string>
+    <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="enable_quick_setting" msgid="2366999897816894536">"Mostrar em \"Configurações rápidas\""</string>
@@ -2030,14 +2047,35 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Ativando o dispositivo em segundo plano"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Solicitando localização com frequência"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps não estão funcionando bem"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"A bateria está em boas condições"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Os apps estão se comportando normalmente"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Baixa capacidade de bateria"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"A bateria não pode oferecer uma boa duração"</string>
+    <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Ativar o gerenciador de bateria inteligente"</string>
+    <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Ative para otimizar o uso da bateria"</string>
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
     <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"O smartphone foi muito usado"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"O tablet foi muito usado"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"O dispositivo foi muito usado"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Cerca de <xliff:g id="HOUR">%1$s</xliff:g> de uso desde a última carga completa"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Seu smartphone foi muito usado, e isso consumiu muita bateria. A bateria está se comportando normalmente.\n\n O smartphone foi usado por cerca de <xliff:g id="HOUR">%1$s</xliff:g> desde a última carga completa.\n\n Uso total:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Seu tablet foi muito usado, e isso consumiu muita bateria. A bateria está se comportando normalmente.\n\n O tablet foi usado por cerca de <xliff:g id="HOUR">%1$s</xliff:g> desde a última carga completa.\n\n Uso total:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Seu dispositivo foi muito usado, e isso consumiu muita bateria. A bateria está se comportando normalmente.\n\n O dispositivo foi usado por cerca de <xliff:g id="HOUR">%1$s</xliff:g> desde a última carga completa.\n\n Uso total:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"Gerenciador de bateria inteligente"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"Gerenciar bateria automaticamente"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"Ajuste automaticamente o consumo de energia de apps com base no uso"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"Apps restritos"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="one">%1$d app</item>
+      <item quantity="other">%1$d apps</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"Parar o app?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Não é possível gerenciar a bateria do smartphone normalmente, porque o app <xliff:g id="APP">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, você pode forçar a parada do app.\n\nSe isso continuar acontecendo, talvez seja necessário desinstalá-lo para melhorar o desempenho da bateria."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Não é possível gerenciar a bateria do tablet normalmente, porque o app <xliff:g id="APP">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, você pode forçar a parada do app.\n\nSe isso continuar acontecendo, talvez seja necessário desinstalá-lo para melhorar o desempenho da bateria."</string>
@@ -2146,6 +2184,7 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Servidor de mídia"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Otimização do app"</string>
     <string name="battery_saver" msgid="8172485772238572153">"Economia de bateria"</string>
+    <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Usar a Economia de bateria"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Ativar automaticamente"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nunca"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"com <xliff:g id="PERCENT">%1$s</xliff:g> de bateria"</string>
@@ -2366,6 +2405,7 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"Remover conta?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"A remoção desta conta excluirá todas as suas mensagens, contatos e outros dados do tablet."</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"A remoção desta conta excluirá todas as suas mensagens, contatos e outros dados do telefone!"</string>
+    <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"A remoção desta conta excluirá do dispositivo todas as mensagens, os contatos e outros dados dela."</string>
     <string name="remove_account_failed" msgid="3901397272647112455">"Esta alteração não é permitida pelo administrador"</string>
     <string name="provider_label" msgid="7724593781904508866">"Enviar inscrições"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2890,8 +2930,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Bloquear perturbações visuais"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permitir sinais visuais"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"Adicionar"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ATIVAR AGORA"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"DESATIVAR AGORA"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Ativar agora"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Desativar agora"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"O modo \"Não perturbe\" fica ativado até <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"O modo \"Não perturbe\" ficará ativado até que você o desative"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"O modo \"Não perturbe\" foi ativado automaticamente por uma regra (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
@@ -2930,7 +2970,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificações de apps"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoria da notificação"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"Grupo de categoria de notificações"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"Importância"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"Comportamento"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"Permitir som"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nunca mostrar notificações"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Sem som ou interrupção visual"</string>
@@ -2948,6 +2988,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Importância média"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importância elevada"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"Importância urgente"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"Mostrar notificações"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Assistente de notificação"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Acesso a notificações"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"O acesso às notificações do perfil de trabalho está bloqueado"</string>
@@ -2978,9 +3019,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acesso \"Não perturbe\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nenhum app instalado solicitou o acesso \"Não perturbe\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Carregando apps…"</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"O Android está impedindo que as notificações desse app sejam exibidas neste dispositivo"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"O Android está impedindo que essa categoria de notificações seja exibida neste dispositivo"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"O Android está impedindo que esse grupo de notificações seja exibido neste dispositivo"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"Conforme sua solicitação, o Android está impedindo que as notificações desse app sejam exibidas neste dispositivo"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Conforme sua solicitação, o Android está impedindo que essa categoria de notificações seja exibida neste dispositivo"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Conforme sua solicitação, o Android está impedindo que esse grupo de notificações seja exibido neste dispositivo"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categorias"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Outros"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3559,31 +3600,8 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"Blocos de desenvolvedor para configurações rápidas"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"Estamos aqui para ajudar"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Estamos aqui para ajudar você 24 horas por dia, 7 dias por semana"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Estamos aqui para ajudar você 24 horas por dia, 7 dias por semana"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"Nossa equipe de suporte está aqui para ajudar a resolver qualquer problema"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Nossa equipe de suporte está disponível o dia todo, todos os dias"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Procure ajuda ou volte durante o horário de suporte (hora local):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Horário do suporte por telefone (hora local)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Procure ajuda ou explore dicas e truques"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"Suporte para:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"Está no exterior?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"Tarifas internacionais podem ser aplicadas"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefone"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"Bate-papo"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Conferir dicas e truques"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Procurar ajuda e enviar feedback"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"Entre em contato com o suporte"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Fazer login"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"Não consegue fazer login?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"Enviar informações do sistema"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Não mostrar novamente"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"Solicitando como"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"Adicionar conta"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"Informações do sistema"</string>
+    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Rastros da janela"</string>
+    <string name="layer_trace_quick_settings_title" msgid="2447147947568109649">"Rastros da camada"</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>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Permitir que sua organização pesquise contatos para identificar autores de chamadas e contatos"</string>
@@ -3599,11 +3617,11 @@
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> segundos</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Tempo aproximado de espera: <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Gerenciar armazenamento"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Para ajudar a liberar espaço de armazenamento, o gerenciador de armazenamento remove fotos e vídeos do seu dispositivo salvos em backup."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Remover fotos e vídeos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Gerenciador de armazenamento"</string>
+    <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Usar gerenciador de armazenamento"</string>
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Modo automático"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Modo manual"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Liberar espaço agora"</string>
@@ -3769,8 +3787,8 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faça um tour pelo seu novo tablet"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Faça um tour pelo seu novo dispositivo"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Este recurso não está disponível neste dispositivo"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
-    <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
-    <skip />
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forçar medições completas de GNSS"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Rastrear todas as constelações e frequências do GNSS sem nenhum ciclo de trabalho"</string>
+    <string name="storage_access" msgid="8905018810338984531">"Acesso ao armazenamento"</string>
+    <string name="keywords_storage_access" msgid="3708874088152933579">"armazenamento acesso diretório com foco"</string>
 </resources>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index d091d83..8f3d63a 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Slab"</item>
     <item msgid="2042505933058940139">"Slab"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"Vechi de peste 60 de zile"</item>
     <item msgid="5692284879054004388">"Vechi de peste 90 de zile"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"Folosiți preferința de rețea"</item>
+    <item msgid="8745603368609022803">"Tratați ca fiind contorizată"</item>
+    <item msgid="2266114985518865625">"Tratați ca fiind necontorizată"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 1a8fbd4..372d75b 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -171,6 +171,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Dispozitivele dvs."</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Asociați un nou dispozitiv"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"Permiteți dispozitivului să se asocieze și să se conecteze la dispozitive Bluetooth"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Dezactivați soneria în căști"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Nu redați tonurile de sonerie personalizate ale telefonului prin căștile Bluetooth"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Conectat în prezent"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"Dispozitive salvate"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"Adăugați un dispozitiv"</string>
@@ -332,6 +334,11 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"Setați data"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sortați în ordine alfabetică"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Sortați după fusul orar"</string>
+    <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> începe pe <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+    <string name="zone_time_type_dst" msgid="8850494578766845276">"Ora de vară"</string>
+    <string name="zone_time_type_standard" msgid="3462424485380376522">"Ora standard"</string>
+    <string name="zone_menu_by_region" msgid="4603214570803607532">"Fusul orar după regiune"</string>
+    <string name="zone_menu_by_offset" msgid="1172774718486088771">"Fusuri orare cu decalaj fix"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Data"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Ora"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Blocare automată"</string>
@@ -350,6 +357,7 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Informații de profil"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Conturi"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Locație"</string>
+    <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Utilizați locația"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Conturi"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"Securitate și locație"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Criptare și date de conectare"</string>
@@ -702,6 +710,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Ca difuzor"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pentru muzică și fișiere media"</string>
     <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="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>
@@ -716,6 +726,7 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nume"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Conectați-vă"</string>
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> încearcă să activeze Wi-Fi"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> încearcă să dezactiveze Wi-Fi"</string>
@@ -733,6 +744,7 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Activați conexiunea Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Utilizați Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="8719175790520448014">"Setări Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurați și gestionați punctele de acces wireless"</string>
@@ -844,7 +856,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponibil)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduceți parola de rețea"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"Rețeaua Wi‑Fi a operatorului"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"Conectați-vă prin <xliff:g id="NAME">%1%s</xliff:g>"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Conectați-vă prin <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Pentru a îmbunătăți precizia locației, precum și pentru alte scopuri, <xliff:g id="APP_NAME">%1$s</xliff:g> solicită permisiunea să activeze scanarea rețelelor, chiar și atunci când rețeaua Wi-Fi este dezactivată.\n\nPermiteți acest lucru pentru toate aplicațiile care solicită scanarea?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Pentru a dezactiva, accesați Avansat din meniul suplimentar."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permiteți"</string>
@@ -921,10 +933,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Banda AP"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Folosiți hotspotul pentru a crea o rețea Wi-Fi pentru celelalte dispozitive. Hotspotul oferă o conexiune de internet folosind conexiunea dvs. de date mobile. Este posibil să se aplice taxe suplimentare pentru datele mobile."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplicațiile pot crea un hotspot pentru a trimite conținut dispozitivelor din apropiere."</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Dezactivați automat hotspotul"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Hotspotul Wi-Fi se va dezactiva dacă nu se conectează niciun dispozitiv"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Se activează hotspotul..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Se dezactivează hotspotul..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> este activ"</string>
@@ -973,6 +983,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"Adresă de urgență"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Folosită ca locație când efectuați un apel de urgență prin Wi-Fi"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Aflați mai multe"</annotation>" despre funcțiile DNS-ului privat"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Afișaj"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sunet"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
@@ -1321,6 +1332,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Noul <xliff:g id="NAME">^1</xliff:g> funcționează. \n\nPentru a muta fotografii, fișiere și datele aplicațiilor pe acest dispozitiv, accesați Setări &gt; Stocare."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Mutați <xliff:g id="APP">^1</xliff:g>"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Va dura doar câteva momente să mutați <xliff:g id="APP">^1</xliff:g> și datele acesteia pe <xliff:g id="NAME_0">^2</xliff:g>. Nu veți putea folosi aplicația până când mutarea nu este finalizată. \n\nNu scoateți <xliff:g id="NAME_1">^2</xliff:g> în timpul procesului de mutare."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Pentru a muta datele, trebuie să deblocați utilizatorul <xliff:g id="APP">^1</xliff:g>."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Se mută <xliff:g id="APP">^1</xliff:g>…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Nu scoateți <xliff:g id="NAME">^1</xliff:g> în timpul procesului de mutare. \n\nAplicația <xliff:g id="APP">^2</xliff:g> de pe acest dispozitiv nu va fi disponibilă până când mutarea nu este finalizată."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Anulați mutarea"</string>
@@ -1481,6 +1493,7 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"Surse de locații"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Despre tabletă"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Despre telefon"</string>
+    <string name="about_settings" product="device" msgid="6717640957897546887">"Despre dispozitiv"</string>
     <string name="about_settings" product="emulator" msgid="221313099578564438">"Despre dispozitivul emulat"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Afișați informații legale, starea și versiunea programului software"</string>
     <string name="legal_information" msgid="5769301644270604095">"Informații de ordin juridic"</string>
@@ -1588,6 +1601,7 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"Afișați toate cele <xliff:g id="COUNT">%1$d</xliff:g> aplicații"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Tableta și datele dvs. personale sunt mai vulnerabile la un atac din partea aplicațiilor necunoscute. Dacă instalați aplicații din această sursă, acceptați că sunteți singura persoană responsabilă pentru deteriorarea tabletei sau pentru pierderea datelor, care pot avea loc în urma utilizării acestor aplicații."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefonul și datele dvs. personale sunt mai vulnerabile la un atac din partea aplicațiilor necunoscute. Dacă instalați aplicații din această sursă, acceptați că sunteți singura persoană responsabilă pentru deteriorarea telefonului sau pentru pierderea datelor, care pot avea loc în urma utilizării acestor aplicații."</string>
+    <string name="install_all_warning" product="device" msgid="3648003301476423145">"Dispozitivul și datele dvs. personale sunt mai vulnerabile la un atac din partea aplicațiilor necunoscute. Dacă instalați aplicații din această sursă, acceptați că sunteți singura persoană responsabilă pentru deteriorarea dispozitivului sau pentru pierderea datelor, care pot avea loc în urma utilizării acestor aplicații."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Setări avansate"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Activați mai multe opțiuni pentru setări"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informații despre aplicație"</string>
@@ -1888,6 +1902,9 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Poate afecta performanța"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clic după ce cursorul a încetat să se mai miște"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Întârziere înainte de clic"</string>
+    <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="enable_quick_setting" msgid="2366999897816894536">"Afișați în Setări rapide"</string>
@@ -2051,14 +2068,36 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Se activează dispozitivul în fundal"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Se solicită frecvent locația"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplicații funcționează incorect"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Bateria este în stare bună"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Aplicațiile au un comportament normal"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Capacitate redusă a bateriei"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Bateria nu poate asigura o autonomie bună"</string>
+    <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Activați gestionarea inteligentă a bateriei"</string>
+    <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Activați pentru a optimiza utilizarea bateriei"</string>
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
     <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Telefonul a fost utilizat intens"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Tableta a fost utilizată intens"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Dispozitivul a fost utilizat intens"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"A fost folosit timp de aproximativ <xliff:g id="HOUR">%1$s</xliff:g> de la ultima încărcare completă"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Din cauza utilizării intense a telefonului, s-a consumat multă baterie. Bateria are un comportament normal.\n\n Telefonul a fost folosit timp de aproximativ <xliff:g id="HOUR">%1$s</xliff:g> de la ultima încărcare completă.\n\n Utilizare totală:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Din cauza utilizării intense a tabletei, s-a consumat multă baterie. Bateria are un comportament normal.\n\n Tableta a fost folosită timp de aproximativ <xliff:g id="HOUR">%1$s</xliff:g> de la ultima încărcare completă.\n\n Utilizare totală:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Din cauza utilizării intense a dispozitivului, s-a consumat multă baterie. Bateria are un comportament normal.\n\n Dispozitivul a fost folosit timp de aproximativ <xliff:g id="HOUR">%1$s</xliff:g> de la ultima încărcare completă.\n\n Utilizare totală:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"Gestionare inteligentă a bateriei"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"Gestionare automată a bateriei"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"Ajustați automat consumul de energie al aplicațiilor în funcție de utilizare"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"Aplicații restricționate"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="few">%1$d aplicații</item>
+      <item quantity="other">%1$d de aplicații</item>
+      <item quantity="one">%1$d aplicație</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"Opriți aplicația?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Telefonul dvs. nu poate gestiona în mod normal bateria, deoarece <xliff:g id="APP">%1$s</xliff:g> păstrează telefonul activ.\n\nCa să remediați problema, puteți să opriți aplicația.\n\nDacă problema persistă, poate fi necesar să dezinstalați aplicația pentru a îmbunătăți performanța bateriei."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Tableta dvs. nu poate gestiona în mod normal bateria, deoarece <xliff:g id="APP">%1$s</xliff:g> păstrează tableta activă.\n\nCa să remediați problema, puteți să opriți aplicația.\n\nDacă problema persistă, poate fi necesar să dezinstalați aplicația pentru a îmbunătăți performanța bateriei."</string>
@@ -2167,6 +2206,7 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Server media"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Optimizarea aplicației"</string>
     <string name="battery_saver" msgid="8172485772238572153">"Economisirea bateriei"</string>
+    <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Utilizați Economisirea bateriei"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Activați automat"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Niciodată"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"la baterie <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2387,6 +2427,7 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"Eliminați contul?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Prin eliminarea acestui cont, se vor șterge toate mesajele și persoanele din agendă pe care le conține, precum și alte date de pe tabletă!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Prin eliminarea acestui cont, se vor șterge toate mesajele și persoanele din agendă pe care le conține, precum și alte date de pe telefon!"</string>
+    <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Prin eliminarea acestui cont, se vor șterge toate mesajele și persoanele de contact pe care le conține, precum și alte date de pe dispozitiv!"</string>
     <string name="remove_account_failed" msgid="3901397272647112455">"Această modificare nu este permisă de administratorul dvs."</string>
     <string name="provider_label" msgid="7724593781904508866">"Abonamente de tip push"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2917,8 +2958,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blocați întreruperile vizuale"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Permiteți semnale vizuale"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"Adăugați"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ACTIVAȚI ACUM"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"DEZACTIVAȚI ACUM"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Activați acum"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Dezactivați acum"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Funcția Nu deranja este activată până la <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Funcția Nu deranja rămâne activă până când o dezactivați"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Funcția Nu deranja a fost activată automat de o regulă (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
@@ -2957,7 +2998,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificări din aplicații"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Categoria notificării"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"Grupul categoriei de notificări"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"Importanță"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"Comportament"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"Permiteți sunetul"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nu afișați niciodată notificările"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Fără sunet sau întrerupere vizuală"</string>
@@ -2975,6 +3016,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Importanță medie"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Importanță ridicată"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"Importanță urgentă"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"Afișați notificările"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Asistent pentru notificări"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Acces la notificări"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Accesul la notificările privind profilul de serviciu este blocat"</string>
@@ -3006,9 +3048,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Acces la funcția Nu deranja"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nicio aplicație instalată nu a solicitat accesul Nu deranja"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Se încarcă aplicațiile..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blochează notificările acestei aplicații pe acest dispozitiv"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blochează această categorie de notificări pe acest dispozitiv"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android blochează acest grup de notificări pe dispozitiv"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"La solicitarea dvs., Android blochează notificările acestei aplicații pe dispozitiv"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"La solicitarea dvs., Android blochează această categorie de notificări pe dispozitiv"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"La solicitarea dvs., Android blochează acest grup de notificări pe dispozitiv"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categorii"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Altele"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3605,31 +3647,8 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"Casete dezvoltator pentru setări rapide"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"Suntem aici pentru a vă ajuta"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Vă stăm la dispoziție non-stop"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Vă stăm la dispoziție non-stop"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"Echipa de asistență vă stă la dispoziție pentru a se ocupa de orice problemă"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Echipa de asistență este disponibilă non-stop"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Căutați ajutor sau reveniți în timpul programului de lucru al echipei de asistență (ora locală):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Programul de lucru pentru asistența telefonică (ora locală)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Căutați în secțiunea de ajutor sau explorați sfaturi și trucuri"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"Asistență pentru:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"Călătoriți în străinătate?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"Se pot aplica taxe internaționale"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Explorați sfaturi și trucuri"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Căutați ajutor și trimiteți feedback"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"Contactați asistența"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Conectați-vă"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"Nu vă puteți conecta?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"Trimiteți informațiile despre sistem"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Nu mai afișa"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"Solicitarea se trimite din contul"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"Adăugați un cont"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"Informații de sistem"</string>
+    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Urmărirea ferestrei"</string>
+    <string name="layer_trace_quick_settings_title" msgid="2447147947568109649">"Urmărirea stratului"</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>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Permiteți căutările persoanelor de contact efectuate de organizația dvs. pentru a identifica apelanții și persoanele de contact"</string>
@@ -3648,11 +3667,11 @@
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> de secunde</item>
       <item quantity="one">O secundă</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Așteptare: aproximativ <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Gestionați spațiul de stocare"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Pentru a elibera spațiu de stocare, managerul spațiului de stocare elimină de pe dispozitiv fotografiile și videoclipurile cărora le-ați făcut backup."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Eliminați fotografii și videoclipuri"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Managerul spațiului de stocare"</string>
+    <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Utilizați Managerul spațiului de stocare"</string>
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Automat"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Manuale"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Eliberați spațiu acum"</string>
@@ -3825,8 +3844,8 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faceți un tur al noii dvs. tablete"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Faceți un tur al noului dvs. dispozitiv"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Această caracteristică nu este disponibilă pe acest dispozitiv"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
-    <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
-    <skip />
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forțați măsurători GNSS complete"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Urmăriți toate constelațiile și frecvențele GNSS fără ciclu de funcționare"</string>
+    <string name="storage_access" msgid="8905018810338984531">"Acces la stocare"</string>
+    <string name="keywords_storage_access" msgid="3708874088152933579">"director stabilit pentru accesul la stocare"</string>
 </resources>
diff --git a/res/values-si/arrays.xml b/res/values-si/arrays.xml
index fb0c577..2a2eb75 100644
--- a/res/values-si/arrays.xml
+++ b/res/values-si/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"දුර්වල"</item>
     <item msgid="2042505933058940139">"දුර්වල"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"දින 60කට වඩා පැරණි"</item>
     <item msgid="5692284879054004388">"දින 90කට වඩා පැරණි"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"ජාල මනාප භාවිත කරන්න"</item>
+    <item msgid="8745603368609022803">"මනින ලද ලෙස සලකන්න"</item>
+    <item msgid="2266114985518865625">"නොමනින ලද ලෙස සලකන්න"</item>
+  </string-array>
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 2783621..fe69e13 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"ඔබගේ උපාංග"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"නව උපාංගය යුගල කරන්න"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"බ්ලූටූත් උපාංගවලට සම්බන්ධ වීමට උපාංගයට ඉඩ දෙන්න"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"කලාපය තුළ නාද වීම අබල කරන්න"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"බ්ලූටූත් හෙඩ්සෙට්වල අභිරුචි දුරකථන නාද රිද්ම වාදනය නොකරන්න"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"දැනට සම්බන්ධ වී ඇත"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"සුරැකි උපාංග"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"උපාංගය එක් කිරීම"</string>
@@ -330,6 +332,11 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"දිනය සකසන්න"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"අකුරු අනුපිළිවෙලට සකසන්න"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"වේලා කලාපය අනුව පෙළගස්වන්න"</string>
+    <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> <xliff:g id="TRANSITION_DATE">%2$s</xliff:g> ආරම්භ වේ."</string>
+    <string name="zone_time_type_dst" msgid="8850494578766845276">"දිවා ආලෝක සුරැකුම් වේලාව"</string>
+    <string name="zone_time_type_standard" msgid="3462424485380376522">"සම්මත වේලාව"</string>
+    <string name="zone_menu_by_region" msgid="4603214570803607532">"කලාපය අනුව වේලා කලාපය"</string>
+    <string name="zone_menu_by_offset" msgid="1172774718486088771">"ස්ථාවර ඕෆ්සෙට් වේලා කලාප"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"දිනය"</string>
     <string name="time_picker_title" msgid="483460752287255019">"කාලය"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"ස්වයංක්‍රියව අගුලු දමන්න"</string>
@@ -348,6 +355,7 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"පැතිකඩ තොරතුරු"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ගිණුම්"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ස්ථානය"</string>
+    <string name="location_settings_master_switch_title" msgid="3560242980335542411">"ස්ථානය භාවිත කරන්න"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ගිණුම්"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"ආරක්ෂාව සහ ස්ථානය"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"සංකේතනය සහ අක්තපත්‍ර"</string>
@@ -691,6 +699,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"නාදක දුරකථනයක් ලෙස"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"සංගීතය සහ මාධ්‍යය සඳහා"</string>
     <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="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>
@@ -705,6 +715,7 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"නම‍"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"පුරන්න"</string>
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> හට Wi-Fi ක්‍රියාත්මක කිරීමට අවශ්‍යය"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> හට Wi-Fi ක්‍රියාවිරහිත කිරීමට අවශ්‍යය"</string>
@@ -722,6 +733,7 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi-Fi සක්‍රිය කරන්න"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Wi-Fi භාවිත කරන්න"</string>
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi සැකසුම්"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"රැහැන් රහිත ප්‍රවේශ තැන් සකසන්න සහ කළමනාකරණය කරන්න"</string>
@@ -833,7 +845,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS පවතී)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ඔබගේ ජාල මුරපදය ඇතුළත් කරන්න"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"වාහක Wi-Fi ජාලය"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> හරහා සම්බන්ධ කරන්න"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> හරහා සම්බන්ධ කරන්න"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ස්ථාන නිරවද්‍යතාවය වැඩි කිරීමට සහ වෙනත් අරමුණු සඳහා, Wi-Fi අක්‍රිය වුවද <xliff:g id="APP_NAME">%1$s</xliff:g>  හට ජාල පරිලෝකනය සක්‍රිය කිරීමට අවශ්‍යය. \n\nපරිලෝකනය අවශ්‍ය සියලු යෙදුම් සඳහා මෙයට අවසර දෙන්නේ ද?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"මෙය අක්‍රිය කිරීමට, ඉතිරී ගිය මෙනුව තුළ උසස් වෙත යන්න."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"අවසර දෙන්න"</string>
@@ -909,10 +921,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP කලාපය"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"ඔබගේ අනෙකුත් උපාංග සඳහා Wi-Fi ජාලයක් තැනීමට හොට්ස්පොට් භාවිත කරන්න. හොට්ස්පොට් ඔබගේ ජංගම දත්ත සබැඳුම භාවිත කරමින් අන්තර්ජාල සපයයි. අමතර ජංගම දත්ත ගාස්තු අදාළ විය හැකිය."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"යෙදුම් අවට උපාංග සමග අන්තර්ගතය බෙදා ගැනීමට හොට්ස්පොට් එකක් සෑදිය හැකිය."</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"ස්වයංක්‍රියව හොට්ස්පොට් ක්‍රියාවිරහිත කරන්න"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"උපාග සම්බන්ධ කර නැතිනම් Wi‑Fi හොට්ස්පොට් ක්‍රියාවිරහිත වනු ඇත"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"හොට්ස්පොට් සක්‍රිය කරමින්..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"හොට්ස්පොට් අක්‍රිය කරමින්…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> සක්‍රීයයි"</string>
@@ -961,6 +971,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"හදිසි අවස්ථා ලිපිනය"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"ඔබ Wi-Fi හරහා හදිසි ඇමතුමක් ලබා ගන්නා විට ඔබගේ ස්ථානය ලෙස භාවිතා වේ"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958">"පුද්ගලික DNS විශේෂාංග ගැන "<annotation id="url">"තව දැන ගන්න"</annotation></string>
     <string name="display_settings_title" msgid="1708697328627382561">"සංදර්ශකය"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ශබ්ද"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ශබ්ද තීව්‍රතා"</string>
@@ -1308,6 +1319,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"ඔබගේ නව <xliff:g id="NAME">^1</xliff:g> වැඩ කරයි. \n\n මෙම උපාංගයට ඡායාරූප, ගොනු, සහ යෙදුම් දත්ත ගෙන යාමට, සැකසීම් &gt; ආචයනය වෙත යන්න."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> ගෙන යාම"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> යෙදුම සහ එහි දත්ත <xliff:g id="NAME_0">^2</xliff:g> වෙත ගෙනයාමට ගතවන්න පොඩි වේලාවක් පමණි. ගෙන යාම සම්පූර්ණ වන තුරු යෙදුම ඔබට භාවිතා කළ නොහැකි වේ.\n\nගෙන යාම අතරතුර <xliff:g id="NAME_1">^2</xliff:g> ඉවත් කරන්න එපා."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"දත්ත ගෙන යාමට ඔබ පරිශීලක <xliff:g id="APP">^1</xliff:g> අගුලු හැරීම අවශ්‍යයි."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> ගෙන යමින්…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"ගෙන යාම අතරතුර <xliff:g id="NAME">^1</xliff:g> ඉවත් කරන්න එපා. \n\nගෙන යාම සම්පූර්ණ වන තුරු මෙම උපාංගයේ <xliff:g id="APP">^2</xliff:g> යෙදුම ලබාගත නොහැකි වනු ඇත."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ගෙන යාම අවලංගු කරන්න"</string>
@@ -1468,6 +1480,7 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"පිහිටීම් මූලාශ්‍ර"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"ටැබ්ලටය පිලිබඳ"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"දුරකථනය පිළිබඳ"</string>
+    <string name="about_settings" product="device" msgid="6717640957897546887">"උපාංගය ගැන"</string>
     <string name="about_settings" product="emulator" msgid="221313099578564438">"උපාංගය ගැන"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"නීතිමය තොරතුරු, තත්වය, මෘදුකාංග අනුවාදය පෙන්වන්න"</string>
     <string name="legal_information" msgid="5769301644270604095">"නීතිමය තොරතුරු"</string>
@@ -1575,6 +1588,7 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"සියලු යෙදුම් <xliff:g id="COUNT">%1$d</xliff:g> බලන්න"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"ඔබගේ ටැබ්ලටය සහ පෞද්ගලික දත්ත නොදන්නා යෙදුම් මඟින් තර්ජන එල්ල කිරීමේ හැකියාව වැඩිය. මෙම මුලාශ්‍රය මඟින් ලැබෙන යෙදුම් ස්ථාපනයෙන් සහ භාවිතයෙන් ඔබේ දුරකතනයට හෝ ඔබේ දත්ත වලට සිදුවන හානිය පිලිබඳ වගකීම ඔබ ලබා ගන්නා බවට එකඟ වේ."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"ඔබගේ දුරකථනය සහ පෞද්ගලික දත්ත නොදන්නා යෙදුම් මඟින් තර්ජන එල්ල කිරීමේ හැකියාව වැඩිය. මෙම මුලාශ්‍රය මඟින් ලැබෙන යෙදුම් ස්ථාපනයෙන් සහ භාවිතයෙන් ඔබේ දුරකතනයට හෝ ඔබේ දත්ත වලට සිදුවන හානිය පිලිබඳ වගකීම ඔබ ලබා ගන්නා බවට එකඟ වේ."</string>
+    <string name="install_all_warning" product="device" msgid="3648003301476423145">"ඔබේ උපාංගය සහ පෞද්ගලික දත්ත නොදන්නා යෙදුම් මඟින් කරන ප්‍රහාරවලට නිරාවරණය වීමේ හැකියාව වඩාත් වැඩිය. මෙම මුලාශ්‍රයෙන් ලැබෙන යෙදුම් ස්ථාපනය කිරීමෙන් , ඔබ ඒවායේ භාවිතයෙන් හට ගත හැකි ඔබේ උපාංගයට වන ඕනෑම හානියකට හෝ දත්ත අහිමි වීමකට ඔබ වග කිය යුතු බවට ඔබ එකඟ වේ."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"උසස් සැකසුම්"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"තවත් සැකසුම් විකල්ප සබල කරන්න"</string>
     <string name="application_info_label" msgid="5736524913065714880">"යෙදුම් තොරතුරු"</string>
@@ -1874,6 +1888,9 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"ඇතැම් විට ක්‍රියාකාරිත්වයට බලපෑ හැක"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"දර්ශකය චලනය නැවතුණ පසු ක්ලික් කිරීම"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ක්ලික් කිරීමට පෙර පමාව"</string>
+    <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="enable_quick_setting" msgid="2366999897816894536">"ඉක්මන් සැකසීම් තුළ පෙන්වන්න"</string>
@@ -2030,14 +2047,35 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"පසුබිමින් උපාංගය අවදි කරමින්"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"නිතර ස්ථානය ඉල්ලා සිටිමින්"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"යෙදුම් <xliff:g id="NUMBER">%1$d</xliff:g>ක් වැරදි ලෙස හැසිරෙමින්"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"බැටරිය හැඩයෙන් හොඳ තත්ත්වයේ පවතී"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"යෙදුම් සාමාන්‍ය ලෙස හැසිරේ"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"අඩු බැටරි ධාරිතාව"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"බැටරියට හොඳ බැටරි ආයු කාලයක් ලබා දිය නොහැකිය"</string>
+    <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"ස්මාර්ට් බැටරි කළමනාකරු ක්‍රියාත්මක කරන්න"</string>
+    <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"බැටරි භාවිතය ප්‍රශස්ත කිරීමට ක්‍රියාත්මක කරන්න"</string>
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
     <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"දුරකථනය දැඩි ලෙස භාවිත වේ"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"ටැබ්ලට් උපාංගය දැඩි ලෙස භාවිත වේ"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"උපාංගය දැඩි ලෙස භාවිත වේ"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"පසුගිය පූර්ණ ආර‍ෝපණයෙන් පසුව <xliff:g id="HOUR">%1$s</xliff:g> පමණ"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"ඔබගේ දුරකථනය දැඩි ලෙස භාවිත කරන අතර මෙය බැටරිය විශාල ප්‍රමාණයක් පරිභෝජනය කරයි. ඔබගේ බැටරිය සාමාන්‍ය පරිදි හැසිරේ.\n\n පසුගිය පූර්ණ ආර‍ෝපණයෙන් පසුව ඔබගේ දුරකථනය <xliff:g id="HOUR">%1$s</xliff:g> පමණ භාවිත කර ඇත.\n\n මුළු භාවිතය:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"ඔබගේ ටැබ්ලට් උපාංගය දැඩි ලෙස භාවිත කරන අතර මෙය බැටරිය විශාල ප්‍රමාණයක් පරිභෝජනය කරයි. ඔබගේ බැටරිය සාමාන්‍ය පරිදි හැසිරේ.\n\n පසුගිය පූර්ණ ආර‍ෝපණයෙන් පසුව ඔබගේ ටැබ්ලට් උපාංගය <xliff:g id="HOUR">%1$s</xliff:g> පමණ භාවිත කර ඇත.\n\n මුළු භාවිතය:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"ඔබගේ උපාංගය දැඩි ලෙස භාවිත කරන අතර මෙය බැටරිය විශාල ප්‍රමාණයක් පරිභෝජනය කරයි. ඔබගේ බැටරිය සාමාන්‍ය පරිදි හැසිරේ.\n\n පසුගිය පූර්ණ ආර‍ෝපණයෙන් පසුව ඔබගේ උපාංගය <xliff:g id="HOUR">%1$s</xliff:g> පමණ භාවිත කර ඇත.\n\n මුළු භාවිතය:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"ස්මාර්ට් බැටරි කළමනාකරු"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"බැටරි ස්වයංක්‍රියව කළමනාකරණය කරන්න"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"භාවිතය මත පදනම්ව යෙදුම මඟින් බලශක්තිය භාවිතය ස්වයංක්‍රියව සීරුමාරු කරන්න"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"සීමා කළ යෙදුම්"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="one">යෙදුම් %1$d</item>
+      <item quantity="other">යෙදුම් %1$d</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"යෙදුම නවත්වන්නද?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"<xliff:g id="APP">%1$s</xliff:g> ඔබේ දුරකථනය අවදියෙන් තබා ගන්නා නිසා ඔබේ දුරකථනයට සාමාන්‍ය පරිදි බැටරිය කළමනාකරණය කළ නොහැකිය.\n\nමෙම ගැටලුව විසඳීමට උත්සාහ කිරීමට, ඔබට යෙදුම නැවැත්විය හැකිය.\n\nමෙය දිගටම සිදු වන්නේ නම්, බැටරි කාර්ය සාධනය වැඩි දියුණු කිරීමට ඔබ යෙදුම අස්ථාපනය කිරීම අවශ්‍ය විය හැකිය."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"<xliff:g id="APP">%1$s</xliff:g> ඔබේ ටැබ්ලටය අවදියෙන් තබා ගන්නා නිසා ඔබේ ටැබ්ලටයට සාමාන්‍ය පරිදි බැටරිය කළමනාකරණය කළ නොහැකිය.\n\nමෙම ගැටලුව විසඳීමට උත්සාහ කිරීමට, ඔබට යෙදුම නැවැත්විය හැකිය.\n\nමෙය දිගටම සිදු වන්නේ නම්, බැටරි කාර්ය සාධනය වැඩි දියුණු කිරීමට ඔබ යෙදුම අස්ථාපනය කිරීම අවශ්‍ය විය හැකිය."</string>
@@ -2146,6 +2184,7 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"මාධ්‍යසේවාදායකය"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"යෙදුම් ප්‍රශස්තකරණය"</string>
     <string name="battery_saver" msgid="8172485772238572153">"බැටරි සුරැකුම"</string>
+    <string name="battery_saver_master_switch_title" msgid="622539414546588436">"බැටරි සුරැකුම භාවිත කරන්න"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"ස්වයන්ක්‍රියව ක්‍රියාත්මක කරන්න"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"කවදාවත් නෑ"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"බැටරිය <xliff:g id="PERCENT">%1$s</xliff:g> හි"</string>
@@ -2366,6 +2405,7 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"ගිණුම ඉවත් කරන්නද?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"මෙම ගිණුම මැකීමෙන් ටැබ්ලටයෙන් එහි සියලු පණිවිඩ, සම්බන්ධතා, සහ වෙනත් දත්ත මැකී යයි!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"මෙම ගිණුම මැකීමෙන් දුරකථනයෙන් එහි සියලු පණිවිඩ, සම්බන්ධතා, සහ වෙනත් දත්ත මකා දමනු ඇත!"</string>
+    <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"මෙම ගිණුම ඉවත් කිරීම උපාංගය වෙතින් එහි සියලු පණිවිඩ, සම්බන්ධතා, සහ වෙනත් දත්ත මකනු ඇත!"</string>
     <string name="remove_account_failed" msgid="3901397272647112455">"ඔබගේ පරිපාලක විසින් මෙම වෙනස් කිරීමට ඉඩ නොදේ"</string>
     <string name="provider_label" msgid="7724593781904508866">"එබුම් දායකත්ව"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2890,8 +2930,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"දෘශ්‍ය බාධක අවහිර කරන්න"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"දෘශ්‍ය සංඥාවලට ඉඩ දෙන්න"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"එක් කරන්න"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"දැන් ක්‍රියාත්මක කරන්න"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"දැන් ක්‍රියාවිරහිත කරන්න"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"දැන් ක්‍රියාත්මක කරන්න"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"දැන් ක්‍රියාවිරහිත කරන්න"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> දක්වා බාධා නොකරන්න ක්‍රියාත්මකයි"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"බාධා නොකරන්න එය ඔබ ක්‍රියාවිරහිත කරන තෙක් ක්‍රියාත්මකව පවතී"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"<xliff:g id="RULE_NAME">%s</xliff:g> රීතියක් මගින් බාධා නොකරන්න ස්වයංක්‍රියව ක්‍රියාත්මක කරන ලදී"</string>
@@ -2930,7 +2970,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"යෙදුම් දැනුම්දීම්"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"දැනුම්දීම් ප්‍රවර්ගය"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"දැනුම්දීම් ප්‍රවර්ග සමූහය"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"වැදගත්කම"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"හැසිරීම"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"ශබ්දයට ඉඩ දෙන්න"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"දැනුම්දීම් කිසිදා නොපෙන්වන්න"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ශබ්ද හෝ දෘශ්‍ය බාධා නැත"</string>
@@ -2948,6 +2988,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"මධ්‍යම වැදගත්කම"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"වැඩි වැදගත්කම"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"හදිසි වැදගත්කම"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"දැනුම්දීම් පෙන්වන්න"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"දැනුම්දීම් සහායක"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"දැනුම්දීම් ප්‍රවේශනය"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"කාර්යාල පැතිකඩ දැනුම් දීම්වලට පිවිසීම අවහිර කර ඇත"</string>
@@ -2978,9 +3019,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"ප්‍රවේශය බාධා නොකරන්න"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ස්ථාපිත යෙදුම් කිසිවක් ප්‍රවේශය බාධා නොකරන්න ඉල්ලා නැත"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"යෙදුම් පූරණය වේ..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android මෙම යෙදුමෙහි දැනුම්දීම් මෙම උපාංගය මත දිස් වීම අවහිර කරමින් ඇත"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android දැනුම්දීම්වල මෙම ප්‍රවර්ගය මෙම උපාංගය මත දිස් වීම අවහිර කරමින් ඇත"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"දැනුම්දීම් සමූහයක් මෙම උපාංගය මත දිස් වීම Android අවහිර කරමින් ඇත"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"ඔබගේ ඉල්ලීම මත, Android මෙම යෙදුමෙහි දැනුම්දීම් මෙම උපාංගය මත දිස් වීම අවහිර කරමින් ඇත"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"ඔබගේ ඉල්ලීම මත, Android මෙම දැනුම්දීම් ප්‍රවර්ගය මෙම උපාංගය මත දිස් වීම අවහිර කරමින් ඇත"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"ඔබගේ ඉල්ලීම මත, Android මෙම දැනුම්දීම් සමූහය මෙම උපාංගය මත දිස් වීම අවහිර කරමින් ඇත"</string>
     <string name="notification_channels" msgid="5346841743182627500">"ප්‍රවර්ග"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"වෙනත්"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3559,31 +3600,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"උපාංග කිහිපයකට සම්බන්ධිතයි"</string>
     <string name="demo_mode" msgid="2798762752209330277">"පද්ධති UI ආදර්ශන ප්‍රකාරය"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"ඉක්මන් සැකසීම් සංවර්ධක ටයිල්"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"උදවු කිරීමට අප මෙතැනය"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"අප දින 7 පැය 24 පුරා ඔබ වෙනුවෙන් මෙතැනය"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"අප දින 7 පැය 24 පුරා ඔබ වෙනුවෙන් මෙතැනය"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"ඕනෑම ගැටලුවක් විසඳීමට උදවු කිරීම සඳහා අපේ සහාය කණ්ඩායම මෙතන සිටී"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"අපගේ සහාය කණ්ඩායම සෑම දිනකම, දවස පුරා මෙහි සිටියි"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"උදවු සොයන්න නැතහොත් සහාය තිබෙන පැය තුළ ආපසු පැමිණෙන්න (දේශීය වේලාවෙන්):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"දුරකථන සහාය ඇති පැය (දේශීය වේලාව)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"උදවු සොයන්න නැතහොත් ඉඟි සහ උපක්‍රම ගවේෂණය කරන්න"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"මෙය සඳහා සහාය:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"පිටරට සංචාරය කරන්නේද?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"ජාත්‍යන්තර ගාස්තු අදාළ විය හැකිය"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"දුරකථනය"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"කතාබහ"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"ඉඟි සහ උපක්‍රම ගවේෂණය කරන්න"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"උදවු සොයන්න සහ ප්‍රතිපෝෂණ යවන්න"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"සහාය අැමතීම"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"පුරන්න"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"පිරිය නොහැකිද?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"පද්ධති තොරතුරු යවන්න"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"නැවත පෙන්වන්න එපා"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"ලෙස ඉල්ලයි"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"ගිණුම එක් කරන්න"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"පද්ධති තොරතුරු"</string>
+    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"කවුළු හඹා යාම"</string>
+    <string name="layer_trace_quick_settings_title" msgid="2447147947568109649">"ස්තර හඹා යාම"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"කාර්යාල පැතිකඩ සැකසීම්"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"සම්බන්ධතා සෙවීම"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"අමතන්නන් හා සම්බන්ධතා හඳුනා ගැනීම සඳහා ඔබේ ආයතනයෙන් සම්බන්ධතා සෙවීම් ඉඩ දෙන්න"</string>
@@ -3599,11 +3617,11 @@
       <item quantity="one">තත්පර <xliff:g id="NUMBER">%s</xliff:g></item>
       <item quantity="other">තත්පර <xliff:g id="NUMBER">%s</xliff:g></item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> රැඳී සිටීම"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"ගබඩාව කළමනාකරණය කරන්න"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"ගබඩා ඉඩ නිදහස් කර ගැනීමට උදවු වීමට, ගබඩා කළමනාකරු ඔබේ උපාංගය වෙතින් උපස්ථ කළ ඡායාරූප සහ වීඩියෝ ඉවත් කරයි."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ඡායාරූප සහ වීඩියෝ ඉවත් කරන්න"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"ගබඩා කළමනාකරු"</string>
+    <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"ගබඩා කළමනාකරු භාවිත කරන්න"</string>
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"ස්වයංක්‍රිය"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"අත්පොත"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"දැන් ඉඩ නිදහස් කර ගන්න"</string>
@@ -3769,8 +3787,8 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ඔබගේ නව ටැබ්ලට් පරිගණකය ගැන දැන ගන්න"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"ඔබගේ නව උපාංගය ගැන දැන ගන්න"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"මෙම අංගය මෙම උපාංගයේ ලබා ගත නොහැක"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
-    <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
-    <skip />
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"සම්පූර්ණ GNSS මිනුම් බලාත්මක කරන්න"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"කාර්ය චක්‍රය රහිත සියලු GNSS සබැඳි තාරකා ගෝල සහ සංඛ්‍යාත"</string>
+    <string name="storage_access" msgid="8905018810338984531">"ගබඩා ප්‍රවේශය"</string>
+    <string name="keywords_storage_access" msgid="3708874088152933579">"ගබඩා ප්‍රවේශ අවකාශ නාමාවලිය"</string>
 </resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index ed58a76..762e502 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Slaba"</item>
     <item msgid="2042505933058940139">"Šibko"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"Starejše od 60 dni"</item>
     <item msgid="5692284879054004388">"Starejše od 90 dni"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"Uporabi nastavitev omrežja"</item>
+    <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>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index cab57e1..df85f45 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -172,6 +172,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaše naprave"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Seznanitev nove naprave"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"Dovoli napravi seznanjanje in povezovanje z napravami Bluetooth"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Onemogoči zvonjenje iz telefona"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"V slušalkah z mikrofonom Bluetooth ne predvajaj tonov zvonjenj po meri"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Trenutno povezano"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"Shranjene naprave"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"Dodajanje naprave"</string>
@@ -334,6 +336,16 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"Nastavi datum"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Razvrsti po abecedi"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Razvrsti po časovnem pasu"</string>
+    <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+    <skip />
+    <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+    <skip />
+    <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+    <skip />
     <string name="date_picker_title" msgid="1338210036394128512">"Datum"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Ura"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Samodejno zaklepanje"</string>
@@ -352,6 +364,8 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Podatki za profil"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Računi"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokacija"</string>
+    <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+    <skip />
     <string name="account_settings_title" msgid="626177544686329806">"Računi"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"Varnost in lokacija"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifriranje in poverilnice"</string>
@@ -713,6 +727,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kot zvočnik"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Za glasbo in predstavnost"</string>
     <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="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>
@@ -727,6 +743,8 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Ime"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+    <skip />
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mb/s"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"Aplikacija <xliff:g id="REQUESTER">%s</xliff:g> želi vklopiti Wi-Fi"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"Aplikacija <xliff:g id="REQUESTER">%s</xliff:g> želi izklopiti Wi-Fi"</string>
@@ -744,6 +762,8 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Vklopi Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+    <skip />
     <string name="wifi_settings_category" msgid="8719175790520448014">"Nastavitve za Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Nastavi in upravljaj brezžične dostopne točke"</string>
@@ -855,7 +875,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je na voljo)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Vnesite geslo za omrežje"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"Omrežje Wi‑Fi operaterja"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"Povezava prek omrežja <xliff:g id="NAME">%1%s</xliff:g>"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Povezava prek omrežja <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Za izboljšanje natančnosti lokacijskih podatkov in druge namene želi <xliff:g id="APP_NAME">%1$s</xliff:g> vklopiti iskanje omrežij, tudi ko je Wi-Fi izklopljen.\n\nŽelite to dovoliti vsem aplikacijam, ki želijo iskati omrežja?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Če želite to možnost izklopiti, v meniju z dodatnimi elementi odprite »Dodatno«."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Dovoli"</string>
@@ -933,10 +953,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Pas dostopne točke"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Uporabite dostopno točko, da ustvarite omrežje Wi‑Fi za svoje druge naprave. Dostopna točka omogoča uporabo interneta prek mobilne podatkovne povezave, zato lahko nastanejo dodatni stroški prenosa podatkov v mobilnih omrežjih."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Aplikacije lahko ustvarijo dostopno točko za skupno rabo vsebin z napravami v bližini."</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Samodejni izklop dostopne točke"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Dostopna točka Wi‑Fi se bo izklopila, če ni povezana nobena naprava"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Vklop dostopne točke  ..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Izklop dostopne točke ..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"Povezava <xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktivna"</string>
@@ -985,6 +1003,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"Naslov za nujne primere"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Uporabljen je kot vaš naslov, ko opravite klic v sili prek Wi‑Fi-ja"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Preberite več"</annotation>" o funkcijah zasebnega strežnika DNS"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Zaslon"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvok"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Glasnost"</string>
@@ -1334,6 +1353,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Nova shramba <xliff:g id="NAME">^1</xliff:g> deluje. \n\nČe želite premikati fotografije, datoteke in podatke aplikacij vanjo, odprite »Nastavitve« &gt; »Shramba«."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Premik aplikacije <xliff:g id="APP">^1</xliff:g>"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Premik aplikacije <xliff:g id="APP">^1</xliff:g> in njenih podatkov v shrambo <xliff:g id="NAME_0">^2</xliff:g> bo trajal samo nekaj trenutkov. Dokler premik ne bo dokončan, aplikacije ne bo mogoče uporabljati. \n\nShrambe <xliff:g id="NAME_1">^2</xliff:g> med premikanjem ne odstranite."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Če želite premakniti podatke, morate odkleniti uporabnika <xliff:g id="APP">^1</xliff:g>."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Premikanje aplikacije <xliff:g id="APP">^1</xliff:g> …"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Shrambe <xliff:g id="NAME">^1</xliff:g> med premikanjem ne odstranite. \n\nAplikacija <xliff:g id="APP">^2</xliff:g> v tej napravi ne bo na voljo, dokler premik ne bo dokončan."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Preklic premika"</string>
@@ -1494,6 +1514,8 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"Viri lokacije"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"O tabličnem računalniku"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"O telefonu"</string>
+    <!-- no translation found for about_settings (6717640957897546887) -->
+    <skip />
     <string name="about_settings" product="emulator" msgid="221313099578564438">"O emulirani napravi"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Ogled pravnih informacij, stanja, različice programske opreme"</string>
     <string name="legal_information" msgid="5769301644270604095">"Pravne informacije"</string>
@@ -1601,6 +1623,8 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"Prikaži vse aplikacije (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Neznane aplikacije lažje napadejo tablični računalnik in osebne podatke v njem. Če namestite aplikacije iz tega vira, se strinjate, da ste sami odgovorni za morebitno škodo, nastalo v tabličnem računalniku, ali izgubo podatkov, ki je lahko posledica uporabe teh aplikacij."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Neznane aplikacije lažje napadejo telefon in osebne podatke v njem. Če namestite aplikacije iz tega vira, se strinjate, da ste sami odgovorni za morebitno škodo, nastalo v telefonu, ali izgubo podatkov, ki je lahko posledica uporabe teh aplikacij."</string>
+    <!-- no translation found for install_all_warning (3648003301476423145) -->
+    <skip />
     <string name="advanced_settings" msgid="1777249286757067969">"Dodatne nastavitve"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Omogoči več možnosti nastavitev."</string>
     <string name="application_info_label" msgid="5736524913065714880">"Podatki o aplikaciji"</string>
@@ -1902,6 +1926,12 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Lahko vpliva na učinkovitost delovanja"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klik, ko se kazalec ustavi"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Zakasnitev pred klikom"</string>
+    <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+    <skip />
+    <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+    <skip />
+    <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+    <skip />
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"VKLOPLJENO"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"IZKLOPLJENO"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Prikaži v »Hitrih nastavitvah«"</string>
@@ -2072,14 +2102,39 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Prebujanje naprave iz ozadja"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Pogosto zahtevanje lokacije"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Nepravilno delovanje več aplikacij (<xliff:g id="NUMBER">%1$d</xliff:g>)"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Akumulator je v dobrem stanju"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Aplikacije delujejo normalno"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Akumulator je skoraj prazen"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Akumulator ne more zagotoviti dolgega časa delovanja"</string>
+    <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+    <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Telefon ste veliko uporabljali"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Tablični računalnik ste veliko uporabljali"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Napravo ste veliko uporabljali"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Približno <xliff:g id="HOUR">%1$s</xliff:g> uporabe od zadnje polne napolnjenosti"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Telefon ste veliko uporabljali, s čimer ste porabili veliko energije akumulatorja. Vedenje akumulatorja je normalno.\n\n Telefon ste od zadnje polne napolnjenosti uporabljali približno <xliff:g id="HOUR">%1$s</xliff:g>.\n\n Skupna uporaba:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Tablični računalnik ste veliko uporabljali, s čimer ste porabili veliko energije akumulatorja. Vedenje akumulatorja je normalno.\n\n Tablični računalnik ste od zadnje polne napolnjenosti uporabljali približno <xliff:g id="HOUR">%1$s</xliff:g>.\n\n Skupna uporaba:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Napravo ste veliko uporabljali, s čimer ste porabili veliko energije akumulatorja. Vedenje akumulatorja je normalno.\n\n Napravo ste od zadnje polne napolnjenosti uporabljali približno <xliff:g id="HOUR">%1$s</xliff:g>.\n\n Skupna uporaba:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"Pametni upravitelj akumulatorja"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"Samodejno upravljanje akumulatorja"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"Samodejno prilagodi porabo energije po posameznih aplikacijah glede na uporabo"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"Omejene aplikacije"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="one">%1$d aplikacija</item>
+      <item quantity="two">%1$d aplikaciji</item>
+      <item quantity="few">%1$d aplikacije</item>
+      <item quantity="other">%1$d aplikacij</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"Želite ustaviti aplikacijo?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Telefon ne more ustrezno upravljati porabe energije akumulatorja, ker aplikacija <xliff:g id="APP">%1$s</xliff:g> ohranja telefon prebujen.\n\nTežavo lahko poskusite rešiti tako, da zaustavite aplikacijo.\n\nČe se težava ponovi, boste za podaljšanje časa delovanja akumulatorja morda morali aplikacijo odstraniti."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Tablični računalnik ne more ustrezno upravljati porabe energije akumulatorja, ker aplikacija <xliff:g id="APP">%1$s</xliff:g> ohranja tablični računalnik prebujen.\n\nTežavo lahko poskusite rešiti tako, da zaustavite aplikacijo.\n\nČe se težava ponovi, boste za podaljšanje časa delovanja akumulatorja morda morali aplikacijo odstraniti."</string>
@@ -2188,6 +2243,8 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Predstavnostni strežnik"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Optimizacija aplikacij"</string>
     <string name="battery_saver" msgid="8172485772238572153">"Varčevanje z energijo akumulatorja"</string>
+    <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+    <skip />
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Samodejni vklop"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nikoli"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"pri <xliff:g id="PERCENT">%1$s</xliff:g> napolnjenosti akumulatorja"</string>
@@ -2408,6 +2465,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"Želite odstraniti račun?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Z odstranitvijo računa boste iz tabličnega računalnika izbrisali vsa sporočila, stike in druge podatke v računu."</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Z odstranitvijo računa boste iz telefona izbrisali vsa sporočila, stike in druge podatke v računu."</string>
+    <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+    <skip />
     <string name="remove_account_failed" msgid="3901397272647112455">"Skrbnik ne dovoli te spremembe"</string>
     <string name="provider_label" msgid="7724593781904508866">"Potisne naročnine"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2860,7 +2919,7 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"natančnost"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"račun"</string>
     <string name="keywords_users" msgid="3434190133131387942">"omejitev, omeji, omejeno"</string>
-    <string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"popravljanje besedila, pravilno, zvok, vibriranje, samodejno, jezik, poteza, predlaganje, predlog, tema, žaljivo, beseda, vrsta, znak emoji, mednarodno"</string>
+    <string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"popravljanje besedila, pravilno, zvok, vibriranje, samodejno, jezik, poteza, predlaganje, predlog, tema, žaljivo, beseda, vrsta, emodžiji, mednarodno"</string>
     <string name="keywords_reset_apps" msgid="5293291209613191845">"ponastavitev, nastavitve, privzeto"</string>
     <string name="keywords_emergency_app" msgid="3143078441279044780">"nujni primer, ice, aplikacij, privzeto"</string>
     <string name="keywords_default_phone_app" msgid="4213090563141778486">"telefon, klicalnik, privzeto"</string>
@@ -2944,8 +3003,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blokiranje vizualnih motenj"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Dovoli vizualne znake"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"Dodaj"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"VKLOPI TAKOJ"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"IZKLOPI TAKOJ"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Vklopi zdaj"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Izklopi zdaj"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Način »ne moti« bo vklopljen do <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Način »ne moti« bo ostal vklopljen, dokler ga ne izklopite"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Način »ne moti« je bil samodejno vklopljen na podlagi pravila (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
@@ -2984,7 +3043,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Obvestila aplikacij"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Kategorija obvestil"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"Skupina kategorij obvestil"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"Pomembnost"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"Vedenje"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"Omogoči zvok"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nikoli ne pokaži obvestil"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Brez zvočne ali vizualne prekinitve"</string>
@@ -3002,6 +3061,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Srednja pomembnost"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Visoka pomembnost"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"Nujna pomembnost"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"Pokaži obvestila"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Pomočnik za obvestila"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Dostop do obvestil"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Dostop do obvestil delovnega profila je blokiran"</string>
@@ -3034,9 +3094,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Dostop do načina »ne moti«"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Nobena nameščena aplikacija ni zahtevala dostopa do načina »ne moti«"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Nalaganje aplikacij ..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Prikazovanje obvestil te aplikacije je izklopljeno v tej napravi Android."</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Prikazovanje obvestil te kategorije je izklopljeno v tej napravi Android."</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Prikazovanje te skupine obvestil je blokirano v tej napravi Android"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"Na vašo zahtevo je prikazovanje obvestil te aplikacije blokirano v tej napravi Android"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Na vašo zahtevo je prikazovanje te kategorije obvestil blokirano v tej napravi Android"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Na vašo zahtevo je prikazovanje te skupine obvestil blokirano v tej napravi Android"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorije"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Drugo"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3651,31 +3711,10 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"Ploščice razvijalcev za hitre nastavitve"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"Tu smo, da vam pomagamo"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Na voljo smo vam 24 ur na dan vse dni v tednu"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Na voljo smo vam 24 ur na dan vse dni v tednu."</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"Skupina za podporo je na voljo, da se posveti morebitnim težavam"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Skupina za podporo je na voljo vsak dan ob vsaki uri"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Iščite po pomoči ali se vrnite med delovnim časom podpore (lokalni čas):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Delovni čas telefonske podpore (lokalni čas)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Iskanje po pomoči ali raziskovanje nasvetov in zvijač"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"Podpora za:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"Potujete po tujini?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"Morda boste morali plačati stroške mednarodnih klicev"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"Klepet"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Raziskovanje nasvetov in zvijač"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Iskanje po pomoči in pošiljanje povratnih informacij"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"Stik s podporo"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Prijava"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"Se ne morete prijaviti?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"Pošiljanje podatkov o sistemu"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Ne prikaži več"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"Zahteva uporabnik"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"Dodajanje računa"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"Podatki o sistemu"</string>
+    <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+    <skip />
+    <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+    <skip />
     <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>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Organizaciji dovoli iskanje po stikih zaradi prepoznavanja klicateljev in stikov"</string>
@@ -3697,11 +3736,12 @@
       <item quantity="few"><xliff:g id="NUMBER">%s</xliff:g> sekunde</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> sekund</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Približna čakalna doba: <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Upravljanje shrambe"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Upravitelj shrambe vam pomaga sprostiti prostor za shranjevanje, tako da iz naprave odstrani varnostno kopirane fotografije in videoposnetke."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Odstranjevanje fotografij in videoposnetkov"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Upravitelj shrambe"</string>
+    <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+    <skip />
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Samodejno"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Ročno"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Sprostitev prostora"</string>
@@ -3881,8 +3921,10 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Oglejte si predstavitev novega tabličnega računalnika"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Oglejte si predstavitev nove naprave"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ta funkcija ni na voljo v tej napravi."</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Vsili popolne meritve GNSS"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Spremljaj vse razmestitve in frekvence GNSS brez ciklov"</string>
+    <!-- no translation found for storage_access (8905018810338984531) -->
     <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+    <!-- no translation found for keywords_storage_access (3708874088152933579) -->
     <skip />
 </resources>
diff --git a/res/values-sw400dp/dimens.xml b/res/values-sw400dp/dimens.xml
index 35a25d8..4f13e09 100755
--- a/res/values-sw400dp/dimens.xml
+++ b/res/values-sw400dp/dimens.xml
@@ -21,4 +21,11 @@
 
     <dimen name="support_escalation_card_padding_start">56dp</dimen>
     <dimen name="support_escalation_card_padding_end">56dp</dimen>
+
+    <!-- Suggestion cards-->
+    <dimen name="suggestion_card_width_one_card">380dp</dimen>
+    <dimen name="suggestion_card_width_two_cards">184dp</dimen>
+    <dimen name="suggestion_card_width_multiple_cards">176dp</dimen>
+    <dimen name="suggestion_card_padding_bottom_one_card">22dp</dimen>
+
 </resources>
diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml
index 4e33f6b..91d95bf 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"చాలా తక్కువ"</item>
     <item msgid="2042505933058940139">"బాగాలేదు"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"60 రోజులు పైబడినవి"</item>
     <item msgid="5692284879054004388">"90 రోజులు పైబడినవి"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"నెట్‌వర్క్ ప్రాధాన్యతను ఉపయోగించండి"</item>
+    <item msgid="8745603368609022803">"గణించబడేదానిగా పరిగణించండి"</item>
+    <item msgid="2266114985518865625">"గణించబడనిదిగా పరిగణించండి"</item>
+  </string-array>
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 66ab29c..0ee61cf 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"మీ పరికరాలు"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"కొత్త పరికరాన్ని జత చేయండి"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"జత చేయడానికి పరికరాన్ని అనుమతించండి మరియు బ్లూటూత్ పరికరాలకు కనెక్ట్ చేయండి"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"బ్యాండ్‌లో రింగ్ అవటాన్ని నిలిపివేయండి"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"బ్లూటూత్ హెడ్‌సెట్‌లలో అనుకూల ఫోన్ రింగ్‌టోన్‌లను ప్లే చేయవద్దు"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"ప్రస్తుతం కనెక్ట్ చేయబడింది"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"సేవ్ చేసిన పరికరాలు"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"పరికరాన్ని జోడించండి"</string>
@@ -330,6 +332,16 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"తేదీని సెట్ చేయి"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"అక్షరక్రమంలో క్రమబద్ధీకరించు"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"సమయ మండలి ద్వారా క్రమబద్ధీకరించు"</string>
+    <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+    <skip />
+    <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+    <skip />
+    <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+    <skip />
     <string name="date_picker_title" msgid="1338210036394128512">"తేదీ"</string>
     <string name="time_picker_title" msgid="483460752287255019">"సమయం"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"స్వయంచాలకంగా లాక్ చేయి"</string>
@@ -348,6 +360,8 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"ప్రొఫైల్ సమాచారం"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ఖాతాలు"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"స్థానం"</string>
+    <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+    <skip />
     <string name="account_settings_title" msgid="626177544686329806">"ఖాతాలు"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"భద్రత &amp; స్థానం"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"ఎన్‌క్రిప్షన్ &amp; ఆధారాలు"</string>
@@ -691,6 +705,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"స్పీకర్ ఫోన్ వలె"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"సంగీతం మరియు మీడియా కోసం"</string>
     <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="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>
@@ -705,6 +721,8 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"పేరు"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+    <skip />
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fiని ఆన్ చేయాలనుకుంటోంది"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fiని ఆఫ్ చేయాలనుకుంటోంది"</string>
@@ -722,6 +740,8 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi‑Fiని ప్రారంభించండి"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+    <skip />
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi సెట్టింగ్‌లు"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"వైర్‌లెస్ యాక్సెస్ స్థానాలను సెటప్ చేయండి &amp; నిర్వహించండి"</string>
@@ -833,7 +853,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS అందుబాటులో ఉంది)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"మీ నెట్‌వర్క్ పాస్‌వర్డ్‌ను నమోదు చేయండి"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"క్యారియర్ Wi‑Fi నెట్‌వర్క్"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> ద్వారా కనెక్ట్ చేయండి"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> ద్వారా కనెక్ట్ చేయండి"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"స్థాన ఖచ్చితత్వాన్ని మెరుగుపరచడానికి మరియు ఇతర ప్రయోజనాల దృష్ట్యా, <xliff:g id="APP_NAME">%1$s</xliff:g> Wi-Fi ఆఫ్‌లో ఉన్నప్పటికీ, నెట్‌వర్క్‌ను స్కాన్ చేయడం ప్రారంభించాలనుకుంటుంది.\n\nస్కాన్ చేయాలనుకునే అన్ని అనువర్తనాల కోసం దీన్ని అనుమతించాలా?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"దీన్ని ఆఫ్ చేయడానికి, ఓవర్‌ఫ్లో మెనులో అధునాతనంకి వెళ్లండి."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"అనుమతించు"</string>
@@ -909,10 +929,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"AP బ్యాండ్"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"మీ ఇతర పరికరాల కోసం Wi-Fi నెట్‌వర్క్‌ని సృష్టించడానికి హాట్‌స్పాట్‌ని ఉపయోగించండి. హాట్‌స్పాట్ అనేది మీ మొబైల్ డేటా కనెక్షన్‌ని ఉపయోగించి ఇంటర్నెట్‌ని అందిస్తుంది. అదనపు మొబైల్ డేటా ఛార్జీలు చెల్లించాల్సి రావచ్చు."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"యాప్‌లు సమీప పరికరాలతో కంటెంట్‌ని షేర్ చేయడం కోసం హాట్‌స్పాట్‌ని సృష్టించవచ్చు."</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"హాట్‌స్పాట్‌ని స్వయంచాలకంగా ఆఫ్ చేయి"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"పరికరాలు ఏవీ కనెక్ట్ కాకపోతే Wi‑Fi హాట్‌స్పాట్‌ ఆఫ్ అవుతుంది"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"హాట్‌స్పాట్‌ను ప్రారంభిస్తోంది…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"హాట్‌స్పాట్‌ను ఆపివేస్తోంది…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> సక్రియంగా ఉంది"</string>
@@ -961,6 +979,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"అత్యవసర చిరునామా"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Wi-Fi ద్వారా అత్యవసర కాల్ చేసినప్పుడు మీ స్థానాన్ని ఉపయోగించబడుతుంది"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958">"ప్రైవేట్ DNS లక్షణాల గురించి "<annotation id="url">"మరింత తెలుసుకోండి"</annotation></string>
     <string name="display_settings_title" msgid="1708697328627382561">"ప్రదర్శన"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ధ్వని"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"వాల్యూమ్‌లు"</string>
@@ -1308,6 +1327,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"మీ కొత్త <xliff:g id="NAME">^1</xliff:g> పని చేస్తోంది. \n\nఫోటోలు, ఫైల్‌లు మరియు అనువర్తన డేటాను ఈ పరికరానికి తరలించడానికి, సెట్టింగ్‌లు &gt; నిల్వకు వెళ్లండి."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g>ని తరలించండి"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g>ను మరియు దాని డేటాను <xliff:g id="NAME_0">^2</xliff:g>కి తరలించడానికి కేవలం కొన్ని క్షణాల సమయం పడుతుంది. మీరు తరలింపు పూర్తయ్యే వరకు అనువర్తనాన్ని ఉపయోగించలేరు. \n\nతరలించే సమయంలో <xliff:g id="NAME_1">^2</xliff:g>ని తీసివేయవద్దు."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"డేటాను తరలించడానికి మీరు వినియోగదారు <xliff:g id="APP">^1</xliff:g>ని అన్‌లాక్ చేయాలి."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g>ని తరలిస్తోంది…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"తరలించే సమయంలో <xliff:g id="NAME">^1</xliff:g>ని తీసివేయవద్దు. \n\nఈ డివైజ్‌లోని <xliff:g id="APP">^2</xliff:g> యాప్ తరలింపు పూర్తయ్యే వరకు అందుబాటులో ఉండదు."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"తరలింపు రద్దు చేయి"</string>
@@ -1468,6 +1488,8 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"స్థానం మూలాలు"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"టాబ్లెట్ పరిచయం"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"ఫోన్ గురించి"</string>
+    <!-- no translation found for about_settings (6717640957897546887) -->
+    <skip />
     <string name="about_settings" product="emulator" msgid="221313099578564438">"పునరుత్పాదిత పరికరం గురించి"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"చట్టపరమైన సమాచారం, స్థితి, సాఫ్ట్‌వేర్ సంస్కరణను వీక్షించండి"</string>
     <string name="legal_information" msgid="5769301644270604095">"చట్టబద్ధమైన సమాచారం"</string>
@@ -1575,6 +1597,8 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"మొత్తం <xliff:g id="COUNT">%1$d</xliff:g> అనువర్తనాలను చూడండి"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"మీ టాబ్లెట్ మరియు వ్యక్తిగత డేటా తెలియని మూలాల్లోని అనువర్తనాల ద్వారా దాడికి గురి కావడానికి ఎక్కువ అవకాశం ఉంటుంది. ఈ మూలం నుండి అనువర్తనాలను ఇన్‌స్టాల్ చేయడం ద్వారా, ఈ అనువర్తనాలను ఉపయోగించడం ద్వారా మీ టాబ్లెట్‌కు సంభవించే ఏదైనా నష్టానికి లేదా కోల్పోయే డేటాకి బాధ్యత వహించడానికి మీరు అంగీకరిస్తున్నారు."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"మీ ఫోన్ మరియు వ్యక్తిగత డేటా తెలియని మూలాల్లోని అనువర్తనాల ద్వారా దాడికి గురి కావడానికి ఎక్కువ అవకాశం ఉంటుంది. ఈ మూలం నుండి అనువర్తనాలను ఇన్‌స్టాల్ చేయడం ద్వారా, ఈ అనువర్తనాలను ఉపయోగించడం వలన మీ ఫోన్‌కు సంభవించే ఏదైనా నష్టానికి లేదా కోల్పోయే డేటాకి బాధ్యత వహించడానికి మీరు అంగీకరిస్తున్నారు."</string>
+    <!-- no translation found for install_all_warning (3648003301476423145) -->
+    <skip />
     <string name="advanced_settings" msgid="1777249286757067969">"అధునాతన సెట్టింగ్‌లు"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"మరిన్ని సెట్టింగ్‌ల ఎంపికలను ప్రారంభించు"</string>
     <string name="application_info_label" msgid="5736524913065714880">"యాప్ సమాచారం"</string>
@@ -1874,6 +1898,12 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"పనితీరుపై ప్రభావం చూపవచ్చు"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"పాయింటర్ కదలడం ఆగిపోయిన తర్వాత క్లిక్ చర్య అమలు చేస్తుంది"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"క్లిక్ చేయడానికి ముందు జాప్యం"</string>
+    <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+    <skip />
+    <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+    <skip />
+    <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+    <skip />
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ఆన్"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ఆఫ్"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"శీఘ్ర సెట్టింగ్‌ల్లో చూపు"</string>
@@ -2030,14 +2060,37 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"పరికరాన్ని నేపథ్యంలో మేల్కొల్పి ఉంచుతుంది"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"తరచుగా స్థానాన్ని అభ్యర్థిస్తుంది"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> యాప్‌లు సరిగ్గా ప్రవర్తించడం లేదు"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"బ్యాటరీ మంచి స్థితిలో ఉంది"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"యాప్‌లు సాధారణంగా పనిచేస్తున్నాయి"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"తక్కువ బ్యాటరీ సామర్థ్యం"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"బ్యాటరీ మంచి బ్యాటరీ జీవితకాలాన్ని అందించలేదు"</string>
+    <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+    <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"ఫోన్ అధికంగా ఉపయోగించబడింది"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"టాబ్లెట్ అధికంగా ఉపయోగించబడింది"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"పరికరం అధికంగా ఉపయోగించబడింది"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"చివరిగా పూర్తి ఛార్జింగ్ చేసినప్పటి నుండి సుమారు <xliff:g id="HOUR">%1$s</xliff:g> సేపు ఉపయోగించబడింది"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"మీ ఫోన్ అధికంగా ఉపయోగించబడినందున బ్యాటరీ ఎక్కువుగా వినియోగించబడింది. మీ బ్యాటరీ సాధారణంగా పని చేస్తోంది.\n\n మీ ఫోన్ చివరిగా పూర్తి ఛార్జింగ్ చేసినప్పటి నుండి సుమారు <xliff:g id="HOUR">%1$s</xliff:g> సేపు ఉపయోగించబడింది.\n\n మొత్తం వినియోగం:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"మీ టాబ్లెట్ అధికంగా ఉపయోగించబడినందున బ్యాటరీ ఎక్కువుగా వినియోగించబడింది. మీ బ్యాటరీ సాధారణంగా పని చేస్తోంది.\n\n మీ టాబ్లెట్ చివరిగా పూర్తి ఛార్జింగ్ చేసినప్పటి నుండి సుమారు <xliff:g id="HOUR">%1$s</xliff:g> సేపు ఉపయోగించబడింది.\n\n మొత్తం వినియోగం:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"మీ పరికరం అధికంగా ఉపయోగించబడినందున బ్యాటరీ ఎక్కువుగా వినియోగించబడింది. మీ బ్యాటరీ సాధారణంగా పని చేస్తోంది.\n\n మీ పరికరం చివరిగా పూర్తి ఛార్జింగ్ చేసినప్పటి నుండి సుమారు <xliff:g id="HOUR">%1$s</xliff:g> సేపు ఉపయోగించబడింది.\n\n మొత్తం వినియోగం:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"స్మార్ట్ బ్యాటరీ మేనేజర్"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"బ్యాటరీని స్వయంచాలకంగా నిర్వహించండి"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"వినియోగం ఆధారంగా స్వయంచాలకంగా యాప్‌లు వినియోగించిన శక్తిని సర్దుబాటు చేయండి"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"నియంత్రించబడిన యాప్‌లు"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="other">%1$d యాప్‌లు</item>
+      <item quantity="one">%1$d యాప్</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"యాప్‌ని ఆపివేయాలా?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"<xliff:g id="APP">%1$s</xliff:g> మీ ఫోన్‌ని మేల్కొల్పి ఉంచుతోంది, కనుక బ్యాటరీని మీ ఫోన్ సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించడానికి, మీరు అనువర్తనాన్ని ఆపివేయవచ్చు.\n\nఈ సమస్య కొనసాగితే, బ్యాటరీ పనితీరును మెరుగుపరచడం కోసం మీరు అనువర్తనాన్ని అన్ఇన్‌స్టాల్ చేయాల్సి రావచ్చు."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"<xliff:g id="APP">%1$s</xliff:g> మీ టాబ్లెట్‌ని మేల్కొల్పి ఉంచుతుంది, కనుక బ్యాటరీని మీ టాబ్లెట్ సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించడానికి, మీరు అనువర్తనాన్ని ఆపివేయవచ్చు.\n\nఈ సమస్య కొనసాగితే, బ్యాటరీ పనితీరును మెరుగుపరచడం కోసం మీరు అనువర్తనాన్ని అన్ఇన్‌స్టాల్ చేయాల్సి రావచ్చు."</string>
@@ -2146,6 +2199,8 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"మీడియా సర్వర్"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"అనువర్తన అనుకూలీకరణ"</string>
     <string name="battery_saver" msgid="8172485772238572153">"బ్యాటరీ సేవర్"</string>
+    <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+    <skip />
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"స్వయంచాలకంగా ఆన్ చేయి"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"ఎప్పటికీ వద్దు"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> బ్యాటరీ ఉన్నప్పుడు"</string>
@@ -2366,6 +2421,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"ఖాతాను తీసివేయాలా?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"ఈ ఖాతాను తీసివేయడం వలన టాబ్లెట్ నుండి దీనికి చెందిన మొత్తం సందేశాలు, పరిచయాలు మరియు ఇతర డేటా తొలగించబడతాయి!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"ఈ ఖాతాను తీసివేయడం వలన ఫోన్ నుండి దానికి సంబంధించిన మొత్తం సందేశాలు, పరిచయాలు మరియు ఇతర డేటా తొలగించబడతాయి!"</string>
+    <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+    <skip />
     <string name="remove_account_failed" msgid="3901397272647112455">"ఈ మార్పును మీ నిర్వాహకులు అనుమతించలేదు"</string>
     <string name="provider_label" msgid="7724593781904508866">"పుష్ చందాలు"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2890,8 +2947,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"దృశ్య అంతరాయాలను బ్లాక్ చేయండి"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"దృశ్యమానత సంకేతాలను అనుమతించండి"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"జోడించు"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ఇప్పుడే ఆన్ చేయండి"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"ఇప్పుడే ఆఫ్ చేయండి"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"ఇప్పుడు ఆన్ చేయండి"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"ఇప్పుడు ఆఫ్ చేయండి"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> వరకు అంతరాయం కలిగించవద్దు ఆన్‌లో ఉంటుంది"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"మీరు అంతరాయం కలిగించవద్దుని ఆఫ్ చేసేంత వరకు ఇది ఆన్‌లో ఉంటుంది"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"<xliff:g id="RULE_NAME">%s</xliff:g> నియమం ద్వారా అంతరాయం కలిగించవద్దు స్వయంచాలకంగా ఆన్ చేయబడింది"</string>
@@ -2930,7 +2987,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"యాప్ నోటిఫికేషన్‌లు"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"నోటిఫికేషన్ వర్గం"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"నోటిఫికేషన్ వర్గం సమూహం"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"ప్రాముఖ్యత"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"ప్రవర్తన"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"ధ్వనిని అనుమతించండి"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"ఎన్నడూ నోటిఫికేషన్‌లను చూపవద్దు"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"శబ్ద లేదా దృశ్య అంతరాయం కలిగించవద్దు"</string>
@@ -2948,6 +3005,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"మధ్యస్థ ప్రాముఖ్యత"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"అధిక ప్రాముఖ్యత"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"అత్యవసర ప్రాముఖ్యత"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"నోటిఫికేషన్‌లను చూపండి"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"నోటిఫికేషన్ సహాయకం"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"నోటిఫికేషన్ యాక్సెస్"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"కార్యాలయ ప్రొఫైల్‌ నోటిఫికేషన్‌లకు యాక్సెస్ బ్లాక్ చేయబడింది"</string>
@@ -2978,9 +3036,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"అంతరాయం కలిగించవద్దు యాక్సెస్"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ఇన్‌స్టాల్ చేసిన యాప్‌లేవీ అంతరాయం కలిగించవద్దు యాక్సెస్ అభ్యర్థించలేదు"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"అనువర్తనాలను లోడ్ చేస్తోంది..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android ఈ డివైజ్‌లో ఈ యాప్ యొక్క నోటిఫికేషన్‌లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android ఈ పరికరంలో ఈ వర్గం యొక్క నోటిఫికేషన్‌లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android ఈ పరికరంలో ఈ సమూహం యొక్క నోటిఫికేషన్‌లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"మీ అభ్యర్ధన మేరకు Android, ఈ పరికరంలో ఈ యాప్ యొక్క నోటిఫికేషన్‌లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"మీ అభ్యర్ధన మేరకు Android, ఈ పరికరంలో ఈ వర్గం యొక్క నోటిఫికేషన్‌లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"మీ అభ్యర్ధన మేరకు Android, ఈ పరికరంలో ఈ సమూహం యొక్క నోటిఫికేషన్‌లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
     <string name="notification_channels" msgid="5346841743182627500">"వర్గాలు"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"ఇతరం"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3560,31 +3618,10 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"బహుళ పరికరాలకు కనెక్ట్ చేయబడింది"</string>
     <string name="demo_mode" msgid="2798762752209330277">"సిస్టమ్ UI డెమో మోడ్"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"త్వరిత సెట్టింగ్‌లు డెవలపర్ టైల్‌లు"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"మేము సహాయం అందిస్తాము"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"మేము మీ కోసం 24/7 అందుబాటులో ఉంటాము"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"మేము మీ కోసం 24 7 అందుబాటులో ఉంటాము"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"మా మద్దతు బృందం ఎలాంటి సమస్యకు సహాయం చేయడానికైనా అందుబాటులో ఉంటుంది"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"మా సహాయక బృందం ఎల్లవేళలా అందుబాటులో ఉంటుంది"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"సహాయం కోసం శోధించండి లేదా ఈ సహాయ వేళల్లో (స్థానిక సమయం) సంప్రదించండి:&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"ఫోన్ సహాయ వేళలు (స్థానిక సమయం)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"సహాయాన్ని శోధించండి లేదా చిట్కాలు &amp; సలహాలను విశ్లేషించండి"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"ఈ దేశాలకు మద్దతు:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"విదేశాలకు ప్రయాణిస్తున్నారా?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"అంతర్జాతీయ ఛార్జీలు వర్తించవచ్చు"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"ఫోన్"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"చాట్"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"చిట్కాలు &amp; ఉపాయాలను చూడండి"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"సహాయాన్ని శోధించండి &amp; అభిప్రాయాన్ని పంపండి"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"మద్దతు విభాగాన్ని సంప్రదించండి"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"సైన్ ఇన్ చేయి"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"సైన్ ఇన్ చేయలేకపోతున్నారా?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"సిస్టమ్ సమాచారాన్ని పంపండి"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"మళ్లీ చూపవద్దు"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"దీనితో అభ్యర్థిస్తున్నారు"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"ఖాతాను జోడించండి"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"సిస్టమ్ సమాచారం"</string>
+    <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+    <skip />
+    <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+    <skip />
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"కార్యాలయ ప్రొఫైల్ సెట్టింగ్‌లు"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"పరిచయ శోధన"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"కాలర్‌లు మరియు పరిచయాలను గుర్తించడానికి మీ సంస్థ ద్వారా పరిచయ శోధనలను చేయడానికి అనుమతిస్తుంది"</string>
@@ -3600,11 +3637,12 @@
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> సెకన్లు</item>
       <item quantity="one">1 సెకను</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> వేచి ఉండాలి"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"నిల్వను నిర్వహించండి"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"నిల్వ స్థలాన్ని ఖాళీ చేయడంలో సహాయపడటానికి, నిల్వ నిర్వాహికి మీ పరికరం నుండి బ్యాకప్ చేసిన ఫోటోలు మరియు వీడియోలను తీసివేస్తుంది."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ఫోటోలు &amp; వీడియోలను తీసివేయి"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"నిల్వ నిర్వాహికి"</string>
+    <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+    <skip />
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"స్వయంచాలకం"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"మాన్యువల్"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"ఇప్పుడు స్థలాన్ని ఖాళీ చేయి"</string>
@@ -3770,8 +3808,10 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"మీ కొత్త టాబ్లెట్ గురించి తెలుసుకోండి"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"మీ కొత్త పరికరం గురించి తెలుసుకోండి"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ఈ లక్షణం ఈ పరికరంలో అందుబాటులో లేదు"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"శక్తివంతమైన GNSS కొలతలు"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"డ్యూటీ సైక్లింగ్ లేకుండా అన్ని GNSS నక్షత్రరాశులను మరియు తరచుదనాలను ట్రాక్ చేయండి"</string>
+    <!-- no translation found for storage_access (8905018810338984531) -->
     <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+    <!-- no translation found for keywords_storage_access (3708874088152933579) -->
     <skip />
 </resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index ad34e20..d83aa73 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Слабкий"</item>
     <item msgid="2042505933058940139">"Слабкий"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"Старіші за 60 днів"</item>
     <item msgid="5692284879054004388">"Додані понад 90 днів тому"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"Використовувати параметри мережі"</item>
+    <item msgid="8745603368609022803">"Вважати тарифікованою"</item>
+    <item msgid="2266114985518865625">"Вважати нетарифікованою"</item>
+  </string-array>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 6a1cdf5..d9110f2 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -172,6 +172,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Ваші пристрої"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Підключити новий пристрій"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"Дозволити пристрою підключатися та під’єднуватися до пристроїв Bluetooth"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Вимкнути внутрішньосмугові сигнали"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Не відтворювати спеціальні сигнали дзвінка телефона через гарнітуру Bluetooth"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Під’єднані пристрої"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"Збережені пристрої"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"Додати пристрій"</string>
@@ -334,6 +336,11 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"Дата"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Сортувати за алфавітом"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Сортувати за часовим поясом"</string>
+    <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> починається <xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+    <string name="zone_time_type_dst" msgid="8850494578766845276">"Літній час"</string>
+    <string name="zone_time_type_standard" msgid="3462424485380376522">"Стандартний час"</string>
+    <string name="zone_menu_by_region" msgid="4603214570803607532">"Часові пояси за регіонами"</string>
+    <string name="zone_menu_by_offset" msgid="1172774718486088771">"Часові пояси з фіксованим зсувом"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Дата"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Час"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Автоматичне блокування"</string>
@@ -352,6 +359,7 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Інформація профілю"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Облікові записи"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Місцезнаходження"</string>
+    <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Використовувати геодані"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Облікові записи"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"Безпека та місцезнаходження"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифрування й облікові дані"</string>
@@ -713,6 +721,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Як пристр.гучн.зв’язку"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Для музики та медіа"</string>
     <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="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>
@@ -727,6 +737,7 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Назва"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 ГГц"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 ГГц"</string>
+    <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Увійти"</string>
     <string name="link_speed" msgid="8896664974117585555">"%1$d Мбіт/с"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"Додаток <xliff:g id="REQUESTER">%s</xliff:g> хоче ввімкнути Wi-Fi"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"Додаток <xliff:g id="REQUESTER">%s</xliff:g> хоче вимкнути Wi-Fi"</string>
@@ -744,6 +755,7 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Увімкнути Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Використовувати Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="8719175790520448014">"Налаштування Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Налашт. і керуйте бездрот. точками доступу"</string>
@@ -855,7 +867,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" Є доступ до WPS"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Введіть пароль своєї мережі"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"Мережа Wi-Fi оператора"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"Під’єднатися через мережу оператора <xliff:g id="NAME">%1%s</xliff:g>"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Під’єднатися через мережу оператора <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Щоб покращити точність даних про місцезнаходження, а також для інших цілей, програма <xliff:g id="APP_NAME">%1$s</xliff:g> хоче вмикати сканування мережі, навіть коли Wi-Fi вимкнено.\n\nДозволити це для всіх програм, які потребують сканування?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Щоб вимкнути, у додатковому меню виберіть \"Додатково\"."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Дозволити"</string>
@@ -933,10 +945,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Діапазон частот точки доступу"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Створіть мережу Wi-Fi для своїх пристроїв за допомогою точки доступу. Точка доступу надає інтернет-з’єднання через мобільне передавання даних. Може стягуватися додаткова плата за використання мобільного трафіку."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Додатки можуть створювати точку доступу, щоб ділитися вмістом із пристроями поруч."</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Вимикати точку доступу автоматично"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Якщо немає під’єднаних пристроїв, точка доступу Wi-Fi вимикатиметься"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Увімкнення точки доступу…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Вимкнення точки доступу…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> активовано"</string>
@@ -985,6 +995,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"Екстрена адреса"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Використовується як адреса, коли ви телефонуєте в екстрені служби через Wi-Fi"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Докладніше"</annotation>" про функції приватної DNS"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Екран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Гучність"</string>
@@ -1334,6 +1345,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Новий пристрій пам’яті <xliff:g id="NAME">^1</xliff:g> налаштовано. \n\nЩоб перемістити на нього фотографії, файли й дані додатків, перейдіть у \"Налаштування\" &gt; \"Пам’ять\"."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Перемістити додаток <xliff:g id="APP">^1</xliff:g>"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Переміщення додатка <xliff:g id="APP">^1</xliff:g> та його даних на пристрій <xliff:g id="NAME_0">^2</xliff:g> займе лише кілька хвилин. Ви не зможете користуватися додатком, поки не завершиться переміщення. \n\nНе видаляйте <xliff:g id="NAME_1">^2</xliff:g> під час переміщення"</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Щоб перемістити дані, потрібно розблокувати користувача <xliff:g id="APP">^1</xliff:g>."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Переміщення додатка <xliff:g id="APP">^1</xliff:g>…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Не видаляйте <xliff:g id="NAME">^1</xliff:g> під час переміщення. \n\nВи не зможете користуватися додатком <xliff:g id="APP">^2</xliff:g> на цьому пристрої, поки не завершиться переміщення."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Скасувати переміщення"</string>
@@ -1494,6 +1506,7 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"Джерела даних про місцезнаходження"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Про пристрій"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Про телефон"</string>
+    <string name="about_settings" product="device" msgid="6717640957897546887">"Про пристрій"</string>
     <string name="about_settings" product="emulator" msgid="221313099578564438">"Про імітований пристрій"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Переглянути правову інф-ю, стан, версію ПЗ"</string>
     <string name="legal_information" msgid="5769301644270604095">"Правова інформація"</string>
@@ -1601,6 +1614,7 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"Переглянути всі додатки: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Ваш планшет і особисті дані більш уразливі до атак із боку додатків із невідомих джерел Установлюючи додатки з цього джерела, ви погоджуєтеся, що несете відповідальність за будь-яку шкоду, заподіяну вашому планшету, чи втрату даних унаслідок використання таких додатків."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Ваш телефон і особисті дані більш уразливі до атак із боку додатків із невідомих джерел Установлюючи додатки з цього джерела, ви погоджуєтеся, що несете відповідальність за будь-яку шкоду, заподіяну вашому телефону, чи втрату даних унаслідок використання таких додатків."</string>
+    <string name="install_all_warning" product="device" msgid="3648003301476423145">"Ваш пристрій і особисті дані більш уразливі до атак невідомих додатків. Установлюючи додатки з цього джерела, ви погоджуєтеся, що несете відповідальність за будь-яку шкоду, заподіяну вашому пристрою, чи втрату даних унаслідок використання таких додатків."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Розширені налаштування"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Увімкнути додаткові варіанти налаштувань"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Про додаток"</string>
@@ -1902,6 +1916,9 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Може вплинути на продуктивність"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Клік після зупинки курсора"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Затримка перед кліком"</string>
+    <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="enable_quick_setting" msgid="2366999897816894536">"Показувати на панелі швидкого налаштування"</string>
@@ -2072,14 +2089,37 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Виводить пристрій із режиму сну у фоновому режимі"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Часто запитує геодані"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Кількість додатків, які працюють неналежним чином: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Акумулятор заряджено"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Додатки працюють нормально"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Низький заряд акумулятора"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Акумулятор працюватиме недовго"</string>
+    <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Увімкніть диспетчер заряду акумулятора"</string>
+    <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Увімкніть, щоб оптимізувати використання акумулятора"</string>
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
     <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Телефон використовувався активно"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Планшет використовувався активно"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Пристрій використовувався активно"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Використовувався впродовж <xliff:g id="HOUR">%1$s</xliff:g> з часу останнього повного заряджання"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Через активне використання телефона заряд акумулятора значно знизився. Акумулятор працює нормально.\n\n Ви користувалися телефоном впродовж <xliff:g id="HOUR">%1$s</xliff:g> з часу останнього повного заряджання.\n\n Загалом спожито:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Через активне використання планшета заряд акумулятора значно знизився. Акумулятор працює нормально.\n\n Ви користувалися планшетом впродовж <xliff:g id="HOUR">%1$s</xliff:g> з часу останнього повного заряджання.\n\n Загалом спожито:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Через активне використання пристрою заряд акумулятора значно знизився. Акумулятор працює нормально.\n\n Ви користувалися пристроєм впродовж <xliff:g id="HOUR">%1$s</xliff:g> з часу останнього повного заряджання.\n\n Загалом спожито:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"Smart battery manager"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"Автоматичне керування зарядом акумулятора"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"Автоматично регулює заряд акумулятора на основі його використання додатками"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"Обмежені додатки"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="one">%1$d додаток</item>
+      <item quantity="few">%1$d додатки</item>
+      <item quantity="many">%1$d додатків</item>
+      <item quantity="other">%1$d додатка</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"Припинити роботу додатка?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Телефон не може нормально керувати зарядом акумулятора, оскільки додаток <xliff:g id="APP">%1$s</xliff:g> утримує його в активному стані.\n\nЩоб вирішити цю проблему, спробуйте припинити роботу додатка.\n\nЯкщо проблема не зникне, можливо, потрібно буде видалити додаток, щоб продовжити роботу акумулятора."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Планшет не може нормально керувати зарядом акумулятора, оскільки додаток <xliff:g id="APP">%1$s</xliff:g> утримує його в активному стані.\n\nЩоб вирішити цю проблему, спробуйте припинити роботу додатка.\n\nЯкщо проблема не зникне, можливо, потрібно буде видалити додаток, щоб продовжити роботу акумулятора."</string>
@@ -2188,6 +2228,7 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Медіа-сервер"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Оптимізація додатка"</string>
     <string name="battery_saver" msgid="8172485772238572153">"Режим економії заряду акумулятора"</string>
+    <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Використовувати режим економії заряду акумулятора"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Вмикати автоматично"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Ніколи"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"коли рівень заряду акумулятора – <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2408,6 +2449,7 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"Видалити обліковий запис?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Видалення цього облікового запису призведе до видалення всіх його повідомлень, контактів та інших даних із планшетного ПК."</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Видалення цього облікового запису призведе до видалення всіх його повідомлень, контактів та інших даних із телефону."</string>
+    <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Якщо видалити цей обліковий запис, ви втратите всі його повідомлення, контакти й інші дані на пристрої."</string>
     <string name="remove_account_failed" msgid="3901397272647112455">"Ця дія заборонена адміністратором"</string>
     <string name="provider_label" msgid="7724593781904508866">"Надіслати підписки"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2944,8 +2986,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Блокувати візуальні сповіщення"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Дозволити візуальні сигнали"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"Додати"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"УВІМКНУТИ"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"ВИМКНУТИ"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Увімкнути"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Вимкнути"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Режим \"Не турбувати\" ввімкнено до <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Режим \"Не турбувати\" буде ввімкнено, доки ви його не вимкнете."</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Правило (<xliff:g id="RULE_NAME">%s</xliff:g>) автоматично ввімкнуло режим \"Не турбувати\""</string>
@@ -2984,7 +3026,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Сповіщення з додатків"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Категорія сповіщень"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"Група категорій сповіщень"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"Пріоритет"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"Поведінка"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"Дозволити звуковий сигнал"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Ніколи не показувати сповіщення"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Без звуку та візуальних сповіщень"</string>
@@ -3002,6 +3044,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Середній пріоритет"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Високий пріоритет"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"Терміново"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"Показувати сповіщення"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Диспетчер сповіщень"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Доступ до сповіщень"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Доступ до сповіщень робочого профілю заблоковано"</string>
@@ -3034,9 +3077,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Доступ у режимі \"Не турбувати\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Установлені додатки не запитували доступу до функції \"Не турбувати\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Завантаження додатків…"</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android блокує сповіщення з цього додатка на цьому пристрої"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android блокує цю категорію сповіщень на цьому пристрої"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android блокує цю групу сповіщень на цьому пристрої"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"На ваш запит Android блокує сповіщення з цього додатка на пристрої"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"На ваш запит Android блокує цю категорію сповіщень на пристрої"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"На ваш запит Android блокує цю групу сповіщень на пристрої"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Категорії"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Інше"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3651,31 +3694,8 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Під’єднано до кількох пристроїв"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Демо-режим інтерфейсу системи"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Швидкі налаштування блоку розробника"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"Ми готові допомогти"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Ми працюємо цілодобово та без вихідних"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Ми працюємо цілодобово та без вихідних"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"Наша служба підтримки допоможе вам вирішити будь-які проблеми"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Наша команда підтримки працює цілодобово та без вихідних"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Скористайтеся довідкою або зв’яжіться з нами в години роботи (за місцевим часом):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Години роботи служби підтримки телефоном (за місцевим часом):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Шукайте в довідці або читайте поради та підказки"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"Підтримується:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"Подорожуєте за кордоном?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"Може стягуватися плата за дзвінок в іншу країну"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Телефон"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"Чат"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Переглянути поради та підказки"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Шукати в довідковому центрі/надіслати відгук"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"Зв’яжіться зі службою підтримки"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Увійти"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"Не можете ввійти?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"Надіслати інформацію про систему"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Більше не показувати"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"Запит з облікового запису"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"Додати обліковий запис"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"Інформація про систему"</string>
+    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Трасування вікон"</string>
+    <string name="layer_trace_quick_settings_title" msgid="2447147947568109649">"Трасування шарів"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Налаштування робочого профілю"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Пошук контактів"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Дозволити вашій організації шукати контакти, щоб визначати абонентів і контактних осіб"</string>
@@ -3697,11 +3717,11 @@
       <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> секунд</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> секунди</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Очікування ~<xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Керувати сховищем"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Щоб звільнити місце, диспетчер пам’яті видаляє з пристрою резервні копії фото й відео."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Видалити фото й відео"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Диспетчер пам’яті"</string>
+    <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Використовувати диспетчер пам’яті"</string>
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Автоматично"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Вручну"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Звільнити місце"</string>
@@ -3881,8 +3901,8 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ознайомтеся зі своїм новим планшетом"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Ознайомтеся зі своїм новим пристроєм"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ця функція недоступна на цьому пристрої"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
-    <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
-    <skip />
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Увімкнути повне вимірювання GNSS"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Відстежувати всі фотосхеми й частоти GNSS без застосування циклічного режиму"</string>
+    <string name="storage_access" msgid="8905018810338984531">"Доступ до пам’яті"</string>
+    <string name="keywords_storage_access" msgid="3708874088152933579">"пам’ять доступ охоплення каталог"</string>
 </resources>
diff --git a/res/values-ur/arrays.xml b/res/values-ur/arrays.xml
index 5ec72cd..e4e4548 100644
--- a/res/values-ur/arrays.xml
+++ b/res/values-ur/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"ناقص"</item>
     <item msgid="2042505933058940139">"ناقص"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"60 دن سے زیادہ پرانی"</item>
     <item msgid="5692284879054004388">"90 دن سے زیادہ پرانی"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"نیٹ ورک کی ترجیح استعمال کریں"</item>
+    <item msgid="8745603368609022803">"میٹر شدہ کے بطور خیال کریں"</item>
+    <item msgid="2266114985518865625">"غیر میٹر شدہ کے بطور خیال کریں"</item>
+  </string-array>
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 80eaa3f..26f53d2 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"آپ کے آلات"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"نئے آلہ کا جوڑا بنائیں"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"آلہ کو جوڑا بنانے اور بلوٹوتھ آلات سے منسلک کرنے کی اجازت دیں"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"ان بینڈ رنگنگ کو غیر فعال کریں"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"بلوٹوتھ ہیڈ سیٹس پر حسب ضرورت رنگ ٹونز نہ بجائیں"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"فی الحال منسلک ہے"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"محفوظ کردہ آلات"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"آلہ شامل کریں"</string>
@@ -330,6 +332,16 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"تاریخ سیٹ کریں"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"حروف تہجی کے لحاظ سے ترتیب دیں"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"ٹائم زون کے لحاظ سے ترتیب دیں"</string>
+    <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+    <skip />
+    <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+    <skip />
+    <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+    <skip />
     <string name="date_picker_title" msgid="1338210036394128512">"تاریخ"</string>
     <string name="time_picker_title" msgid="483460752287255019">"وقت"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"خود کار طور پر مقفل کریں"</string>
@@ -348,6 +360,8 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"پروفائل کی معلومات"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"اکاؤنٹس"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"مقام"</string>
+    <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+    <skip />
     <string name="account_settings_title" msgid="626177544686329806">"اکاؤنٹس"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"سیکیورٹی اور مقام"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"مرموز کاری اور اسناد"</string>
@@ -691,6 +705,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"بطور اسپیکر فون"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"موسیقی اور میڈیا کیلئے"</string>
     <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="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>
@@ -705,6 +721,8 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"نام"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2.4‎ GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5‎ GHz"</string>
+    <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+    <skip />
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"‏<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fi کو آن کرنا چاہتی ہے"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"‏<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fi کو آف کرنا چاہتی ہے"</string>
@@ -722,6 +740,8 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"‏Wi‑Fi آن کریں"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+    <skip />
     <string name="wifi_settings_category" msgid="8719175790520448014">"‏Wi‑Fi ترتیبات"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"وائرلیس رسائی پوائنٹس کو ترتیب دیں اور ان کا نظم کریں"</string>
@@ -833,7 +853,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS دستیاب ہے)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"اپنا نیٹ ورک پاس ورڈ درج کریں"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"‏کیریئر Wi‑Fi نیٹ ورک"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"منسلک ہوں بذریعہ <xliff:g id="NAME">%1%s</xliff:g>"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"منسلک ہوں بذریعہ <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"‏مقام کی قطعیت کو بہتر بنانے اور دوسرے مقاصد کیلئے، <xliff:g id="APP_NAME">%1$s</xliff:g> Wi-Fi بند ہونے پر بھی نیٹ ورک اسکیننگ آن کرنا چاہتی ہے۔\n\nاسکین کرنے کی خواہاں سبھی ایپس کیلئے اس کی اجازت دیں؟"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"اسے آف کرنے کیلئے، اوور فلو مینو میں ایڈوانسڈ پر جائیں۔"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"اجازت دیں"</string>
@@ -909,10 +929,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"‏AP بینڈ"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"‏اپنے دیگر آلات کیلئے Wi‑Fi نیٹ ورک بنانے کی خاطر ہاٹ اسپاٹ کا استعمال کریں۔ ہاٹ اسپاٹ آپ کے موبائل ڈیٹا کنکشن کا استعمال کر کے انٹرنیٹ فراہم کرتا ہے۔ اضافی موبائل ڈیٹا کے چارجز عائد ہو سکتے ہیں۔"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"قریبی آلات کے ساتھ مواد کا اشتراک کرنے کے لیے ایپس ایک ہاٹ اسپاٹ بنا سکتی ہیں۔"</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"خودکار طور پر ہاٹ اسپاٹ آف کریں"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"‏کوئی آلہ منسلک نہ ہونے پر Wi‑Fi ہاٹ اسپاٹ آف ہو جائے گا"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"ہاٹ اسپاٹ آن ہو رہا ہے…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"ہاٹ اسپاٹ آف ہو رہا ہے…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> فعال ہے"</string>
@@ -961,6 +979,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"ہنگامی پتہ"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"‏جب آپ Wi-Fi سے ہنگامی کال کرتے ہیں، تو آپ کے مقام کے طور پر استعمال ہوتا ہے"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958">"‏نجی DNS کی خصوصیات کے بارے میں "<annotation id="url">"مزید جانیں"</annotation></string>
     <string name="display_settings_title" msgid="1708697328627382561">"ڈسپلے"</string>
     <string name="sound_settings" msgid="5534671337768745343">"آواز"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"والیومز"</string>
@@ -1308,6 +1327,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"‏آپ کا نیا <xliff:g id="NAME">^1</xliff:g> کام کر رہا ہے۔ ‎\n\n‎تصاویر، فائلیں اور ایپ کا ڈیٹا اس آلہ پر منتقل کرنے کیلئے، ترتیبات &gt; اسٹوریج پر جائیں۔"</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> کو منتقل کریں"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"‏<xliff:g id="APP">^1</xliff:g> اور اس کا ڈیٹا <xliff:g id="NAME_0">^2</xliff:g> میں منتقل کرنے میں بس تھوڑی دیر لگے گی۔ منتقلی مکمل ہونے تک آپ ایپ کو استعمال نہیں کر سکیں گے۔ ‎\n\n‎منتقلی کے دوران <xliff:g id="NAME_1">^2</xliff:g> کو نہ ہٹائیں۔"</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"ڈیٹا منتقل کرنے کیلئے آپ کو صارف <xliff:g id="APP">^1</xliff:g> کو غیر مقفل کرنے کی ضرورت ہے۔"</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> کو منتقل کیا جا رہا ہے…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"‏منتقلی کے دوران <xliff:g id="NAME">^1</xliff:g> کو نہ ہٹائیں۔ ‎\n\n‎اس آلہ پر <xliff:g id="APP">^2</xliff:g> ایپ منتقلی مکمل ہونے تک دستیاب نہیں ہوگی۔"</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"منتقلی منسوخ کریں"</string>
@@ -1468,6 +1488,8 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"مقام کے مآخذ"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"ٹیبلٹ کے بارے میں"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"فون کے بارے میں"</string>
+    <!-- no translation found for about_settings (6717640957897546887) -->
+    <skip />
     <string name="about_settings" product="emulator" msgid="221313099578564438">"ہمسر آلہ کے بارے میں"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"قانونی معلومات، اسٹیٹس، سافٹ ویئر ورژن دیکھیں"</string>
     <string name="legal_information" msgid="5769301644270604095">"قانونی معلومات"</string>
@@ -1575,6 +1597,8 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"سبھی <xliff:g id="COUNT">%1$d</xliff:g> ایپس دیکھیں"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"آپ کے ٹیبلیٹ اور ذاتی ڈیٹا کو نامعلوم ایپس کی جانب سے حملے کا زیادہ خطرہ ہے۔ اس ذریعے سے ایپس ڈاؤن لوڈ کر کے، آپ اس بات سے اتفاق کرتے ہیں کہ آپ ان ایپس سے اپنے ٹیبلیٹ کو ہونے والے کسی بھی نقصان یا ڈیٹا کے نقصان کیلئے تنہا خود ذمہ دار ہوں گے۔"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"آپ کے فون اور ذاتی ڈیٹا کو نامعلوم ایپس کی جانب سے حملے کا زیادہ خطرہ ہے۔ اس ذریعے سے ایپس ڈاؤن لوڈ کر کے، آپ اس بات سے اتفاق کرتے ہیں کہ آپ ان ایپس سے اپنے فون کو ہونے والے کسی بھی نقصان یا ڈیٹا کے نقصان کیلئے تنہا خود ذمہ دار ہوں گے۔"</string>
+    <!-- no translation found for install_all_warning (3648003301476423145) -->
+    <skip />
     <string name="advanced_settings" msgid="1777249286757067969">"جدید ترین ترتیبات"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"مزید ترتیبات اختیارات کو فعال کریں"</string>
     <string name="application_info_label" msgid="5736524913065714880">"ایپ کی معلومات"</string>
@@ -1874,6 +1898,12 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"کارکردگی متاثر ہو سکتی ہے"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"پوائنٹر رُک جائے تو کلک کریں"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"کلک سے قبل توقف"</string>
+    <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+    <skip />
+    <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+    <skip />
+    <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+    <skip />
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"آن"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"آف"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"فوری ترتیبات میں دکھائیں"</string>
@@ -2030,14 +2060,37 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"پس منظر مییں آلہ چل رہا ہے"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"کثرت سے مقام کی درخواست کی جا رہی ہے"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ایپس صحیح سے کام نہیں کر رہی ہیں"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"بیٹری اچھی حالت میں ہے"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"ایپس حسب معمول برتاؤ کر رہی ہیں"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"بیٹری کی صلاحیت کم ہے"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"بیٹری زیادہ دیر تک نہیں چل سکتی"</string>
+    <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+    <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"فون بہت زیادہ استعمال ہوا"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"ٹیبلیٹ بہت زیادہ استعمال ہوا"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"آلہ بہت زیادہ استعمال ہوا"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"آخری بار مکمل چارج ہونے کے بعد سے تقریباً <xliff:g id="HOUR">%1$s</xliff:g> استعمال ہوا"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"آپ کے فون کا کافی زیادہ استعمال ہونے کی وجہ سے اس کی بیٹری بہت زیادہ صرف ہوئی ہے۔ آپ کی بیٹری حسب معمول برتاؤ کر رہی ہے۔\n\n آپ کا فون آخری بار مکمل چارج ہونے کے بعد سے تقریباً <xliff:g id="HOUR">%1$s</xliff:g> استعمال ہوا۔\n\n کل استعمال:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"آپ کے ٹیبلیٹ کا کافی زیادہ استعمال ہونے کی وجہ سے اس کی بیٹری بہت زیادہ صرف ہوئی ہے۔ آپ کی بیٹری حسب معمول برتاؤ کر رہی ہے۔\n\n آپ کا ٹیبلیٹ آخری بار مکمل چارج ہونے کے بعد سے تقریباً <xliff:g id="HOUR">%1$s</xliff:g> استعمال ہوا۔\n\n کل استعمال:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"آپ کے آلے کا کافی زیادہ استعمال ہونے کی وجہ سے اس کی بیٹری بہت زیادہ صرف ہوئی ہے۔ آپ کی بیٹری حسب معمول برتاؤ کر رہی ہے۔\n\n آپ کا آلہ آخری بار مکمل چارج ہونے کے بعد سے تقریباً <xliff:g id="HOUR">%1$s</xliff:g> استعمال ہوا۔\n\n کل استعمال:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"اسمارٹ بیٹری مینیجر"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"بیٹری کا خودکار نظم کریں"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"استعمال کی بنیاد پر پاور کے استعمال کو خودکار طور پر ایڈجسٹ کریں"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"محدود کردہ ایپس"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="other">‏%1$d ایپس</item>
+      <item quantity="one">‏%1$d ایپ</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"ایپ بند کریں؟"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"آپ کا فون نارمل طریقے سے بیٹری کا نظم نہیں کر سکتا کیوںکہ <xliff:g id="APP">%1$s</xliff:g> آپ کے فون کو بیدار رکھ رہی ہے۔\n\nاس مسئلے کو حل کرنے کیلئے آپ ایپ کو روک سکتے ہیں۔\n\nاگر یہ سلسلہ جاری رہتا ہے تو آپ کو بیٹری کی کارکردگی کو بہتر بنانے کیلئے ایپ کو اَن انسٹال کرنا پڑ سکتا ہے۔"</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"آپ کا ٹیبلیٹ نارمل طریقے سے بیٹری کا نظم نہیں کر سکتا کیوںکہ <xliff:g id="APP">%1$s</xliff:g> آپ کے ٹیبلیٹ کو بیدار رکھ رہی ہے۔\n\nاس مسئلے کو حل کرنے کیلئے آپ ایپ کو روک سکتے ہیں۔\n\nاگر یہ سلسلہ جاری رہتا ہے تو آپ کو بیٹری کی کارکردگی کو بہتر بنانے کیلئے ایپ کو اَن انسٹال کرنا پڑ سکتا ہے۔"</string>
@@ -2146,6 +2199,8 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"ایپ کو بہتر بنانا"</string>
     <string name="battery_saver" msgid="8172485772238572153">"بیٹری سیور"</string>
+    <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+    <skip />
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"خود کار طور پر آن کریں"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"کبھی نہیں"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> بیٹری پر"</string>
@@ -2366,6 +2421,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"اکاؤنٹ ہٹائیں؟"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"اس اکاؤنٹ کو ہٹانے سے اس کے سبھی پیغامات، رابطے اور ٹیبلٹ سے دیگر ڈیٹا حذف ہو جائیں گے!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"اس اکاؤنٹ کو ہٹانے سے اس کے سبھی پیغامات، رابطے اور فون سے دیگر ڈیٹا حذف ہو جائیں گے!"</string>
+    <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+    <skip />
     <string name="remove_account_failed" msgid="3901397272647112455">"آپ کے منتظم کی طرف سے اس تبدیلی کی اجازت نہیں ہے"</string>
     <string name="provider_label" msgid="7724593781904508866">"پُش سبسکرپشنز"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2888,8 +2945,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"بصری مداخلتیں مسدود کریں"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"بصری سگنلز کی اجازت دیں"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"شامل کریں"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"ابھی آن کریں"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"ابھی بند کریں"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"ابھی آن کریں"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"ابھی آف کریں"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"\'ڈسٹرب نہ کریں\' <xliff:g id="FORMATTED_TIME">%s</xliff:g> تک آن ہے"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"جب تک آپ \'ڈسٹرب نہ کریں\' بند نہیں کرتے تب تک وہ آن ہی رہے گا"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"\'ڈسٹرب نہ کریں\' کسی اصول (<xliff:g id="RULE_NAME">%s</xliff:g>) کے ذریعے خودکار طور پر آن ہو گیا تھا"</string>
@@ -2928,7 +2985,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"ایپ کی اطلاعات"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"اطلاع کا زمرہ"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"اطلاع کے زمرہ کا گروپ"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"اہمیت"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"برتاؤ"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"آواز کی اجازت دیں"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"کبھی اطلاعات نہ دکھائیں"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"کوئی صوتی یا بصری مداخلت نہیں"</string>
@@ -2946,6 +3003,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"متوسط اہمیت"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"زیادہ اہمیت"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"فوری اہمیت"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"اطلاعات دکھائیں"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"اطلاع کا معاون"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"اطلاع تک رسائی"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"دفتری پروفائل کی اطلاعات تک رسائی مسدود ہے"</string>
@@ -2976,9 +3034,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"ڈسٹرب نہ کریں تک رسائی"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"کسی انسٹال کردہ ایپس نے ڈسٹرب نہ کریں تک رسائی کی درخواست نہیں کی ہے"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ایپس لوڈ ہو رہی ہیں…"</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"‏Android اس ایپ کی اطلاعات کو اس آلہ پر ظاہر ہونے سے مسدود کررہا ہے"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"‏Android اطلاعات کے اس زمرے کو اس آلہ پر ظاہر ہونے سے مسدود کررہا ہے"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"‏Android اطلاعات کے اس گروپ کو اس آلہ پر ظاہر ہونے سے مسدود کر رہا ہے"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"‏آپ کی درخواست پر، Android اس ایپ کی اطلاعات کو اس آلہ پر ظاہر ہونے سے مسدود کررہا ہے"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"‏آپ کی درخواست پر، Android اطلاعات کے اس زمرے کو اس آلہ پر ظاہر ہونے سے مسدود کررہا ہے"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"‏آپ کی درخواست پر، Android اطلاعات کے اس گروپ کو اس آلہ پر ظاہر ہونے سے مسدود کر رہا ہے"</string>
     <string name="notification_channels" msgid="5346841743182627500">"زمرے"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"دیگر"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3557,31 +3615,10 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"متعدد آلات سے منسلک کردہ"</string>
     <string name="demo_mode" msgid="2798762752209330277">"‏سسٹم UI ڈیمو موڈ"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"فوری ترتیبات کے ڈیولپر ٹائلز"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"ہم مدد کیلئے ہیں نا"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"ہم 24/7 آپ کیلئے یہاں موجود ہیں"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"‏ہم 24‎ 7 آپ کیلئے یہاں موجود ہیں"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"ہماری سپورٹ ٹیم کسی بھی قسم کا مسئلہ حل کرنے میں مدد کرنے کیلئے موجود ہے"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"ہماری سپورٹ ٹیم ہر وقت، سارا دن آپ کی مدد کیلئے موجود ہوتی ہے"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"‏مدد تلاش کریں یا سپورٹ کے اوقات میں واپس آئیں (مقامی وقت کے مطابق):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"‏فون سپورٹ کے اوقات (مقامی وقت)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"مدد تلاش کریں یا تجاویز اور تراکیب دریافت کریں"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"سپورٹ برائے:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"بیرون ملک کا سفر کر رہے ہیں؟"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"بین الاقوامی چارجز لاگو ہو سکتے ہیں"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"فون"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"چیٹ کریں"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"تجاویز اور تراکیب دریافت کریں"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"مدد تلاش کریں اور تاثرات بھیجیں"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"سپورٹ سے رابطہ کریں"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"سائن ان کریں"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"سائن ان نہیں کر سکتے؟"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"سسٹم کی معلومات بھیجیں"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"دوبارہ مت دکھائیں"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"درخواست کی جا رہی ہے بطور"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"اکاؤنٹ شامل کریں"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"سسٹم کی معلومات"</string>
+    <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+    <skip />
+    <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+    <skip />
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"دفتری پروفائل کی ترتیبات"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"رابطہ تلاش"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"کالرز اور رابطوں کی شناخت کیلئے اپنی تنظیم کی جانب سے رابطہ تلاشیوں کی اجازت دیں"</string>
@@ -3597,11 +3634,12 @@
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> سیکنڈ</item>
       <item quantity="one">1 سیکنڈ</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"<xliff:g id="ESTIMATE">%1$s</xliff:g>~ انتظار"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"اسٹوریج کا نظم کریں"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"اسٹوریج کی جگہ خالی کرنے میں مدد کیلئے، اسٹوریج مینیجر آپ کے آلہ سے بیک اپ شدہ تصاویر اور ویڈیوز ہٹا دیتا ہے۔"</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"تصاویر اور ویڈیوز ہٹائیں"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"اسٹوریج مینیجر"</string>
+    <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+    <skip />
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"خودکار"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"مینوئل"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"اب جگہ خالی کریں"</string>
@@ -3767,8 +3805,10 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"اپنے نئے ٹیبلیٹ کا ایک ٹؤر لیں"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"اپنے نئے آلے کا ایک ٹؤر لیں"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"یہ خصوصیت اس آلہ میں دستیاب نہیں ہے"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"‏مکمل GNSS پیمائشوں کو زبردستی لاگو کریں"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"‏ڈیوٹی سائیکلنگ کے بغیر سبھی GNSS مجموعوں اور کثرتوں کو ٹریک کریں"</string>
+    <!-- no translation found for storage_access (8905018810338984531) -->
     <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+    <!-- no translation found for keywords_storage_access (3708874088152933579) -->
     <skip />
 </resources>
diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml
index 6acd7c4..9c9b39c 100644
--- a/res/values-uz/arrays.xml
+++ b/res/values-uz/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Juda past"</item>
     <item msgid="2042505933058940139">"Juda past"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"60 kundan ko‘proq"</item>
     <item msgid="5692284879054004388">"90 kundan ko‘proq"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"Tarmoq sozlamalaridan foydalanish"</item>
+    <item msgid="8745603368609022803">"Pulli"</item>
+    <item msgid="2266114985518865625">"Bepul"</item>
+  </string-array>
 </resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 72c9f28..81e4cc0 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Qurilmalaringiz"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Yangi qurilmani ulash"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"Qurilmaning Bluetooth qurilmalarga ulanishiga ruxsat berish"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Bitta liniyada jiringlashni faolsizlantirish"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Bluetooth quloqliklar orqali moslashtirilgan ringtonlar ijro etilmasin"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Hozirda ulangan"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"Saqlangan qurilmalar"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"Qurilma qo‘shish"</string>
@@ -330,6 +332,11 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"Sana"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Alifbo bo‘yicha saralash"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Vaqt mintaqasi bo‘yicha saralash"</string>
+    <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> <xliff:g id="TRANSITION_DATE">%2$s</xliff:g> sanasida boshlanadi."</string>
+    <string name="zone_time_type_dst" msgid="8850494578766845276">"Yozgi vaqt"</string>
+    <string name="zone_time_type_standard" msgid="3462424485380376522">"Standart vaqt"</string>
+    <string name="zone_menu_by_region" msgid="4603214570803607532">"Hududlar bo‘yicha vaqt mintaqasi"</string>
+    <string name="zone_menu_by_offset" msgid="1172774718486088771">"Vaqt mintaqalarining surilishi tuzatildi"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Sana"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Vaqt"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Qurilmaning avtomatik qulflanishi"</string>
@@ -348,6 +355,7 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Profil ma’lumotlari"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Hisoblar"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Joylashuv"</string>
+    <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Joylashuv axborotidan foydalanish"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Hisoblar"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"Xavfsizlik va joylashuv"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Shifrlash va hisob ma’lumotlari"</string>
@@ -691,6 +699,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Telefon karnayi sifatida"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Musiqa va media uchun"</string>
     <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="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>
@@ -705,6 +715,7 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Nomi"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GGs"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GGs"</string>
+    <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Kirish"</string>
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbit/s"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> ilovasi Wi-Fi tarmog‘ini yoqmoqchi"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> ilovasi Wi-Fi tarmog‘ini o‘chirib qo‘ymoqchi"</string>
@@ -722,6 +733,7 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi‑Fi‘ni yoqish"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Wi-Fi orqali"</string>
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi sozlamalari"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Ulanish nuqtalarini sozlash &amp; boshqarish"</string>
@@ -833,7 +845,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS mavjud)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Tarmoqqa ulanish uchun parolni kiriting"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"Aloqa operatorining Wi‑Fi tarmog‘i"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1%s</xliff:g> orqali ulanish"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"<xliff:g id="NAME">%1$s</xliff:g> orqali ulanish"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Joylashuv aniqligini yana ham yaxshilash va boshqa maqsadlar uchun, Wi-Fi o‘chirilgan bo‘lsada <xliff:g id="APP_NAME">%1$s</xliff:g> tarmoqlarni qidirish vazifasini yoqmoqchi.\n\nBu ruxsat tarmoqlarni qidirishni istagan barcha ilovalarga berilsinmi?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Uni o‘chirish uchun menyudan “Qo‘shimcha” bandiga o‘ting."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Ruxsat berish"</string>
@@ -909,10 +921,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"Wi-Fi chastotalari diapazoni"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Boshqa qurilmalaringiz uchun Wi-Fi tarmoq yaratish uchun hotspotdan foydalaning. Hotspot mobil internetingizni tarqatadi. Mobil internet uchun qo‘shimcha to‘lovlar olinishi mumkin."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Ilovalar yaqin-atrofdagi qurilmalarga kontent ulashish uchun hotspot yarata oladi."</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Hotspotni avtomatik faolsizlantirish"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Hech qanday qurilma ulanmagan bo‘lsa, Wi-Fi hotspot faolsizlantiriladi"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Ulanish nuqtasi yoqilmoqda…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Ulanish nuqtasi o‘chirilmoqda…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> faol"</string>
@@ -961,6 +971,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"Favqulodda holatlardagi manzili"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Wi‑Fi orqali favqulodda chaqiruv amalga oshirilganda joylashuvingizdan foydalaniladi"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958">"Maxfiy DNS imkoniyatlari haqida "<annotation id="url">"batafsil axborot"</annotation></string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekran"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Tovush"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Ovoz balandligi"</string>
@@ -1308,6 +1319,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Yangi “<xliff:g id="NAME">^1</xliff:g>” kartasi ishlashga tayyor. \n\nUnga rasm, ilova ma’lumotlari va boshqa fayllarni ko‘chirib o‘tkazish uchun Sozlamalar &gt; Xotira bo‘limiga o‘ting."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> ilovasini ko‘chirib o‘tkazing"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> va uning ma’lumotlarini “<xliff:g id="NAME_0">^2</xliff:g>” kartasiga ko‘chirib o‘tkazish biroz vaqt oladi. Ko‘chirish tugamaguncha ilovadan foydalana olmaysiz. \n\nKo‘chirish davomida “<xliff:g id="NAME_1">^2</xliff:g>” kartasini chiqara ko‘rmang."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Ma’lumotlarni ko‘chirish uchun <xliff:g id="APP">^1</xliff:g> foydalanuvchisini oching."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> ko‘chirib o‘tkazilmoqda…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Ko‘chirish davomida “<xliff:g id="NAME">^1</xliff:g>” kartasini chiqara ko‘rmang. \n\n Ushbu qurilmadagi <xliff:g id="APP">^2</xliff:g> ilovasi ko‘chirish tugamaguncha ishlamaydi."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Ko‘chirishni bekor qilish"</string>
@@ -1468,6 +1480,7 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"Joylashuv manbalari"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Planshet haqida"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Telefon haqida"</string>
+    <string name="about_settings" product="device" msgid="6717640957897546887">"Qurilma haqida"</string>
     <string name="about_settings" product="emulator" msgid="221313099578564438">"Taqlid qurilma haqida"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Yuridik ma’lumotlar, holat, dasturiy ta’minot versiyasini ko‘rish"</string>
     <string name="legal_information" msgid="5769301644270604095">"Huquqiy ma’lumotlar"</string>
@@ -1575,6 +1588,7 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"Barcha ilovalar (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Planshetingiz va shaxsiy ma‘lumotlaringiz notanish ilovalar xujumiga zaif bo‘ladi. Bunday ilovalarni ushbu manbadan o‘rnatish bilan ularning planshetizga yetkazadigan shikast va ma‘lumotlaringizni o‘chirib yuborishiga javobgarlikni o‘z zimmangizga olasiz."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Telefoningiz va shaxsiy ma‘lumotlaringiz notanish ilovalar xujumiga zaif bo‘ladi. Bunday ilovalarni ushbu manbadan o‘rnatish bilan ularning telefoningizga yetkazadigan shikast va ma‘lumotlaringizni o‘chirib yuborishiga javobgarlikni o‘z zimmangizga olasiz."</string>
+    <string name="install_all_warning" product="device" msgid="3648003301476423145">"Qurilmangiz va shaxsiy ma’lumotlaringiz notanish ilovalar hujumiga qarshilik ko‘rsata olmaydi. Ushbu manbadan ilovalar o‘rnatish orqali siz ulardan foydalanish natijasida qurilmangizga yetkazilgan har qanday zarar yoki o‘chib ketgan ma’lumotlaringiz uchun o‘zingiz javobgar bo‘lasiz."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Kengaytirilgan sozlamalar"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Qo‘shimcha sozlamalar tanlamalarini yoqib qo‘yish"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Ilova haqida"</string>
@@ -1874,6 +1888,9 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Unumdorligiga ta’sir qilishi mumkin"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Kursor harakatlanishdan to‘xtagandan keyin bosing"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Bosishdan oldin biroz kuting"</string>
+    <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="enable_quick_setting" msgid="2366999897816894536">"Tezkor sozlamalarda ko‘rsatish"</string>
@@ -2036,14 +2053,43 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Qurilmani fonda uyg‘otmoqda"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Joylashuv axborotini tez-tez so‘ramoqda"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ta ilova xato ishlayapti"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Batareya quvvati joyida"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Ilovalar odatdagidek ishlamoqda"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Batareya sig‘imi kichik"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Batareya uzoq muddat ishlay olmaydi"</string>
+    <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Smart batareya boshqaruvini yoqing"</string>
+    <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Batareya sarfini optimallashtirish uchun yoqing"</string>
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
     <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Telefon qattiq ishlatildi"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Planshet qattiq ishlatildi"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Qurilma qattiq ishlatildi"</string>
+    <!-- String.format failed for translation -->
+    <!-- no translation found for battery_tip_high_usage_summary (5437023146333888605) -->
+    <skip />
+    <!-- String.format failed for translation -->
+    <!-- no translation found for battery_tip_dialog_message (6744251070067861233) -->
+    <skip />
+    <!-- String.format failed for translation -->
+    <!-- no translation found for battery_tip_dialog_message (7091442312127403445) -->
+    <skip />
+    <!-- String.format failed for translation -->
+    <!-- no translation found for battery_tip_dialog_message (7621045312469814256) -->
+    <skip />
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"Batareya quvvatini tejash"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"Energiya iste’molini avtomatik nazorat qilish"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"Ilovalarning energiya iste’molini avtomatik nazorat qilish"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"Cheklangan imkoniyatli ilovalar"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="other">%1$d ta ilova</item>
+      <item quantity="one">%1$d ta ilova</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"Ilova yopilsinmi?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Telefoningiz batareyani normal boshqara olmayapti, chunki <xliff:g id="APP">%1$s</xliff:g> ilovasi telefoningizni yoniq qoldirmoqda.\n\nBu muammoni tuzatish uchun ilovani majburan to‘xtatishingiz mumkin.\n\nAgar bu yana takrorlansa, batareya quvvati unumdorligini oshirish uchun ilovani o‘chirib tashlashingiz lozim bo‘ladi."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Planshetingiz batareyani normal boshqara olmayapti, chunki <xliff:g id="APP">%1$s</xliff:g> ilovasi planshetingizni yoniq qoldirmoqda.\n\nBu muammoni tuzatish uchun ilovani majburan to‘xtatishingiz mumkin.\n\nAgar bu yana takrorlansa, batareya quvvati unumdorligini oshirish uchun ilovani o‘chirib tashlashingiz lozim bo‘ladi."</string>
@@ -2158,6 +2204,7 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Ilovalarni optimallashtirish"</string>
     <string name="battery_saver" msgid="8172485772238572153">"Quvvat tejash"</string>
+    <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Quvvat tejash funksiyasidan foydalanish"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Avtomatik yoqish"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Hech qachon"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"batareya quvvati: <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2378,6 +2425,7 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"Hisobni olib tashlansinmi?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Ushbu hisob bilan bog‘liq barcha xabarlar, kontaktlar va boshqa ma’lumotlar telefondan o‘chib ketadi."</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Ushbu hisob bilan bog‘liq barcha xabarlar, kontaktlar va boshqa ma’lumotlar telefondan o‘chib ketadi."</string>
+    <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Ushbu hisob o‘chirilganda unga bog‘liq barcha xabar, kontakt va boshqa ma’lumotlar qurilmadan o‘chib ketadi."</string>
     <string name="remove_account_failed" msgid="3901397272647112455">"Bu o‘zgarishni amalga oshirish uchun administrator ruxsat bermagan"</string>
     <string name="provider_label" msgid="7724593781904508866">"Bosma obunalar"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2902,8 +2950,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Vizual bildirishnomalarni bloklash"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Vizual signallarga ruxsat"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"Qo‘shish"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"YOQISH"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"O‘CHIRISH"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Yoqish"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Faolsizlantirish"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Bezovta qilinmasin rejimi <xliff:g id="FORMATTED_TIME">%s</xliff:g> gacha yoqilgan"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Bezovta qilinmasin rejimi uni o‘chirmaguningizcha yoniq qoladi"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Bezovta qilinmasin rejimi <xliff:g id="RULE_NAME">%s</xliff:g> qoidasi tomonidan yoqilgan"</string>
@@ -2942,7 +2990,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Ilova bildirishnomalari"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Bildirishnomalar turkumi"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"Bildirishnomalar turkumi guruhi"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"Muhimligi"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"Xatti-harakatlar"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"Ovozga ruxsat berish"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Bildirishnomalar hech qachon ko‘rsatilmasin"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Bildirishnomalarsiz"</string>
@@ -2960,6 +3008,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"O‘rtacha muhim"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Juda muhim"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"Favqulodda muhim"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"Bildirishnomalar ko‘rsatilsin"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Bildirishnoma yordamchisi"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Bildirishnomalarga ruxsat"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Ishchi profil bildirishnomalariga kirish taqiqlangan"</string>
@@ -2990,9 +3039,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Bezovta qilinmasin rejimi"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Hech qaysi ilova “Bezovta qilinmasin” funksiyasiga ruxsat so‘ramagan"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ilovalar yuklanmoqda…"</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android bu qurilmada ushbu ilova bildirishnomalarini bloklamoqda"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android bu qurilmada ushbu turkum bildirishnomalarini bloklamoqda"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android bu qurilmada ushbu bildirishnomalar guruhini bloklamoqda"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"Bu ilova bildirishnomalarini faolsizlantirdingiz"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Bu turkum bildirishnomasini faolsizlantirdingiz"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Mazkur bildirishnomalar guruhini faolsizlantirdingiz"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Turkumlar"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Boshqa"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3291,7 +3340,7 @@
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Agar MTP qo‘llab-quvvatlanmasa, surat yoki fayllarni o‘tkazish (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"MIDI sifatida foydalanish"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Bu qurilmadan MIDI sifatida foydalanish"</string>
-    <string name="usb_use" msgid="3256040963685055320">"USB rejimi"</string>
+    <string name="usb_use" msgid="3256040963685055320">"USB ulanish maqsadi"</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="3629517713817003738">"Quvvat uzatish"</string>
@@ -3571,31 +3620,8 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"Tezkor sozlamalarning dasturchi tugmalari"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"Sizga yordam berish uchun shu yerdamiz"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Biz kecha-yu kunduz xizmatingizdamiz"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Biz kecha-yu kunduz xizmatingizdamiz"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"Bizning ko‘mak jamoamiz har qanday masalani hal qilish uchun xizmatingizda"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Ko‘mak markazimiz jamoasi kecha-yu kunduz xizmatingizda"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Muammolar yechimini qidiring yoki ko‘mak xizmati ish soatlarida (mahalliy vaqt bilan) bog‘laning:&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Ko‘mak xizmatining ish soatlari (mahalliy vaqt bilan):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Muammolar yechimini qidiring yoki maslahat va tavsiyalar bilan tanishib chiqing"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"Ko‘mak xizmati:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"Sayohat qilyapsizmi?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"Xalqaro qo‘ng‘iroqlar uchun to‘lov olinishi mumkin"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Maslahat va tavsiyalar bilan tanishib chiqish"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Muammolar yechimini qidirish va fikr-mulohaza yuborish"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"Ko‘mak xizmati bilan bog‘lanish"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Kirish"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"Hisobingizga kira olmayapsizmi?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"Tizim haqida ma’lumotlarni yuborish"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Boshqa ko‘rsatilmasin"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"So‘rov yuborish…"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"Hisob qo‘shish"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"Tizimga oid ma’lumotlar"</string>
+    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Oyna trassirovkasi"</string>
+    <string name="layer_trace_quick_settings_title" msgid="2447147947568109649">"Qatlam trassirovkasi"</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>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Tashkilot nomi bo‘yicha qidiruvda qo‘ng‘iroq qiluvchi abonent va uning kontaktini aniqlashga ruxsat berish"</string>
@@ -3611,11 +3637,11 @@
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> soniya</item>
       <item quantity="one">1 soniya</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"Kutish: taxminan <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Xotirani boshqarish"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Xotiradan joy bo‘shatishga yordamlashish uchun xotira boshqaruvi qurilmangizdan zaxiralangan rasm va videolarni o‘chirib tashlaydi."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Rasm va videolarni o‘chirib tashlash"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Xotira boshqaruvi"</string>
+    <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Xotira boshqaruvidan foydalanish"</string>
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Avtomatik"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Qo‘llanma"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Joy bo‘shatish"</string>
@@ -3781,8 +3807,8 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Yangi planshetingiz bilan tanishib chiqing"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Yangi qurilmangiz bilan tanishib chiqing"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Bu funksiya ushbu qurilmada ishlamaydi"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
-    <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
-    <skip />
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Butun GNSS statistikasini yuklash"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Siklsiz barcha GNSS sxema va davriyliklarini kuzatish"</string>
+    <string name="storage_access" msgid="8905018810338984531">"Xotiraga kirish"</string>
+    <string name="keywords_storage_access" msgid="3708874088152933579">"xotira ruxsati katalogga berilgan"</string>
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index e29b113..c991cab 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"差"</item>
     <item msgid="2042505933058940139">"差"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"超過 60 天"</item>
     <item msgid="5692284879054004388">"超過 90 天"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"使用網路偏好設定"</item>
+    <item msgid="8745603368609022803">"視為計量付費"</item>
+    <item msgid="2266114985518865625">"視為非計量付費"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 27d1c90..a52183c 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"你的裝置"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"配對新裝置"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"允許裝置與藍牙裝置配對並建立連線"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"停用藍牙同步鈴聲功能"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"不透過藍牙耳機播放自訂手機鈴聲"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"目前已連線的裝置"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"已儲存的裝置"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"新增裝置"</string>
@@ -330,6 +332,16 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"設定日期"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"依照字母排序"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"依照時區排序"</string>
+    <!-- no translation found for zone_change_to_from_dst (118656001224045590) -->
+    <skip />
+    <!-- no translation found for zone_time_type_dst (8850494578766845276) -->
+    <skip />
+    <!-- no translation found for zone_time_type_standard (3462424485380376522) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_region (4603214570803607532) -->
+    <skip />
+    <!-- no translation found for zone_menu_by_offset (1172774718486088771) -->
+    <skip />
     <string name="date_picker_title" msgid="1338210036394128512">"日期"</string>
     <string name="time_picker_title" msgid="483460752287255019">"時間"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"自動鎖定"</string>
@@ -348,6 +360,8 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"個人資料資訊"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"帳戶"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"定位"</string>
+    <!-- no translation found for location_settings_master_switch_title (3560242980335542411) -->
+    <skip />
     <string name="account_settings_title" msgid="626177544686329806">"帳戶"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"安全性與位置資訊"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"加密和憑證"</string>
@@ -691,6 +705,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"當成手機喇叭"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"使用於音樂與媒體"</string>
     <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="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>
@@ -705,6 +721,8 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"名稱"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <!-- no translation found for wifi_sign_in_button_text (8404345621836792112) -->
+    <skip />
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"「<xliff:g id="REQUESTER">%s</xliff:g>」要求開啟 Wi-Fi"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"「<xliff:g id="REQUESTER">%s</xliff:g>」要求關閉 Wi-Fi"</string>
@@ -722,6 +740,8 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"開啟 Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <!-- no translation found for wifi_settings_master_switch_title (4746267967669683259) -->
+    <skip />
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi 設定"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"設定、管理無線網路存取點"</string>
@@ -833,7 +853,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (可使用 WPS)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"輸入你的網路密碼"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"電信業者 Wi‑Fi 網路"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"透過「<xliff:g id="NAME">%1%s</xliff:g>」連線"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"透過「<xliff:g id="NAME">%1$s</xliff:g>」連線"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> 要求開啟網路掃描功能 (即使 Wi-Fi 已關閉),藉此提升定位精確度及用於其他用途。\n\n你要對所有需要執行掃描的應用程式允許這項要求嗎?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"如要關閉這項功能,請在溢位選單中選取 [進階]。"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"允許"</string>
@@ -909,10 +929,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"存取點頻帶"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"使用無線基地台建立 Wi‑Fi 網路供其他裝置使用。無線基地台會使用你的行動數據連線提供網際網路。可能需支付額外的行動數據傳輸費用。"</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"應用程式可以建立無線基地台來和鄰近的裝置分享內容。"</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"自動關閉無線基地台"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"Wi‑Fi 無線基地台會在沒有任何裝置連線時關閉"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"正在開啟無線基地台…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"正在關閉無線基地台…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> 使用中"</string>
@@ -961,6 +979,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"緊急地址"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"當你透過 Wi‑Fi 網路撥打緊急電話時,系統會判定你位於這個地址"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"進一步瞭解"</annotation>"私人 DNS 功能"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"顯示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音效"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
@@ -1044,7 +1063,7 @@
     <string name="auto_brightness_very_high_title" msgid="8867164854439331022">"非常高"</string>
     <string name="auto_brightness_subtitle" msgid="6454652530864093466">"你偏好的亮度"</string>
     <string name="auto_brightness_off_summary" msgid="7629228736838155268">"不要根據環境光源調整亮度"</string>
-    <string name="auto_brightness_very_high_summary" msgid="4551003097086220709">"電池用量已增加"</string>
+    <string name="auto_brightness_very_high_summary" msgid="4551003097086220709">"將增加電池用量"</string>
     <string name="auto_brightness_disclaimer" msgid="871436423746343406">"根據環境光源調整最佳亮度。開啟這項功能之後,你依然可以暫時調整亮度。"</string>
     <string name="night_display_title" msgid="2626451512200357686">"夜燈"</string>
     <string name="night_display_text" msgid="1837277457033025056">"夜燈功能會將你的螢幕色調改為琥珀色,讓你更輕鬆地在光線昏暗的環境中查看螢幕,也比較容易入睡。"</string>
@@ -1088,13 +1107,13 @@
     <string name="automatic_brightness" msgid="5014143533884135461">"自動調整亮度"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"舉起即可喚醒"</string>
     <string name="ambient_display_screen_title" msgid="4252755516328775766">"環境顯示"</string>
-    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"一律開啟/電池用量已增加"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"一律開啟/將增加電池用量"</string>
     <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"新通知"</string>
     <string name="ambient_display_category_triggers" msgid="4359289754456268573">"顯示時機"</string>
     <string name="doze_title" msgid="2375510714460456687">"新通知"</string>
     <string name="doze_summary" msgid="3846219936142814032">"收到通知時喚醒螢幕"</string>
     <string name="doze_always_on_title" msgid="1046222370442629646">"一律開啟"</string>
-    <string name="doze_always_on_summary" msgid="6978257596231155345">"顯示時間、通知圖示和其他資訊。電池用量已增加。"</string>
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"顯示時間、通知圖示和其他資訊。將增加電池用量。"</string>
     <string name="title_font_size" msgid="4405544325522105222">"字型大小"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"縮小或放大文字"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM 卡鎖定設定"</string>
@@ -1308,6 +1327,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"新的「<xliff:g id="NAME">^1</xliff:g>」運作中。\n\n如要將相片、檔案和應用程式資料移動到這台裝置上,請前往 [設定] &gt; [儲存空間]。"</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"移動「<xliff:g id="APP">^1</xliff:g>」"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"將「<xliff:g id="APP">^1</xliff:g>」和相關資料移動到「<xliff:g id="NAME_0">^2</xliff:g>」只需要幾分鐘。移動作業完成後,你才可以使用該應用程式。\n\n請勿在執行移動作業時移除「<xliff:g id="NAME_1">^2</xliff:g>」。"</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"你必須將使用者「<xliff:g id="APP">^1</xliff:g>」解鎖,才能移動資料。"</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"正在移動「<xliff:g id="APP">^1</xliff:g>」…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"請勿在執行移動作業時移除「<xliff:g id="NAME">^1</xliff:g>」。\n\n移動作業完成後,這台裝置上的「<xliff:g id="APP">^2</xliff:g>」應用程式才可供使用。"</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"取消移動"</string>
@@ -1468,6 +1488,8 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"位置資訊來源"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"關於平板電腦"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"關於手機"</string>
+    <!-- no translation found for about_settings (6717640957897546887) -->
+    <skip />
     <string name="about_settings" product="emulator" msgid="221313099578564438">"關於模擬裝置"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"查看法律資訊、狀態、軟體版本"</string>
     <string name="legal_information" msgid="5769301644270604095">"法律資訊"</string>
@@ -1575,6 +1597,8 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"查看全部共 <xliff:g id="COUNT">%1$d</xliff:g> 個應用程式"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"來歷不明的應用程式可能會損害你的平板電腦和個人資料。安裝這個來源提供的應用程式集表示你同意,如因使用這些應用程式導致你的平板電腦受損或資料遺失,須自行負責。"</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"來歷不明的應用程式可能會損害你的手機和個人資料。安裝這個來源提供的應用程式即表示你同意,如因使用這些應用程式導致你的手機受損或資料遺失,須自行負責。"</string>
+    <!-- no translation found for install_all_warning (3648003301476423145) -->
+    <skip />
     <string name="advanced_settings" msgid="1777249286757067969">"進階設定"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"啟用更多設定選項"</string>
     <string name="application_info_label" msgid="5736524913065714880">"應用程式資訊"</string>
@@ -1874,6 +1898,12 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"可能會影響效能"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"游標停止移動後點擊"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"點擊前延遲"</string>
+    <!-- no translation found for accessibility_service_master_switch_title (6835441300276358239) -->
+    <skip />
+    <!-- no translation found for accessibility_daltonizer_master_switch_title (8655284637968823154) -->
+    <skip />
+    <!-- no translation found for accessibility_caption_master_switch_title (4010227386676077826) -->
+    <skip />
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"開啟"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"關閉"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"在快速設定中顯示"</string>
@@ -2030,14 +2060,37 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"在背景喚醒裝置"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"要求取得位置資訊的頻率過高"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> 個應用程式未正常運作"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"電池狀態良好"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"應用程式正常運作中"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"電池電量不足"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"電量衰退過快"</string>
+    <!-- no translation found for battery_tip_smart_battery_title (8471762806923764455) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_smart_battery_summary (3024670691742861841) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
+    <skip />
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
+    <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"頻繁使用手機"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"頻繁使用平板電腦"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"頻繁使用裝置"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"自上次完全充飽電後已使用了約 <xliff:g id="HOUR">%1$s</xliff:g>"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"你的手機因為頻繁使用而耗用大量電力。你的電池目前正常運作中。\n\n自上次完全充飽電後,你的手機已使用了約 <xliff:g id="HOUR">%1$s</xliff:g>。\n\n總用量:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"你的平板電腦因為頻繁使用而耗用大量電力。你的電池目前正常運作中。\n\n自上次完全充飽電後,你的平板電腦已使用了約 <xliff:g id="HOUR">%1$s</xliff:g>。\n\n總用量:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"你的裝置因為頻繁使用而耗用大量電力。你的電池目前正常運作中。\n\n自上次完全充飽電後,你的裝置已使用了約 <xliff:g id="HOUR">%1$s</xliff:g>。\n\n總用量:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"Smart battery manager"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"自動管理電池"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"根據使用情形自動調整應用程式的耗電量"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"受限制的應用程式"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="other">%1$d 個應用程式</item>
+      <item quantity="one">%1$d 個應用程式</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"要停止應用程式嗎?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"由於「<xliff:g id="APP">%1$s</xliff:g>」一直讓你的手機保持喚醒狀態,因此手機無法正常管理電池。\n\n你可以停止這個應用程式來解決此問題。\n\n如果問題持續發生,你可能需要解除安裝該應用程式,才能改善電池效能。"</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"由於「<xliff:g id="APP">%1$s</xliff:g>」一直讓你的平板電腦保持喚醒狀態,因此平板電腦無法正常管理電池。\n\n你可以停止這個應用程式來解決此問題。\n\n如果問題持續發生,你可能需要解除安裝該應用程式,才能改善電池效能。"</string>
@@ -2146,6 +2199,8 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"媒體伺服器"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"應用程式最佳化"</string>
     <string name="battery_saver" msgid="8172485772238572153">"節約耗電量"</string>
+    <!-- no translation found for battery_saver_master_switch_title (622539414546588436) -->
+    <skip />
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"自動開啟"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"永遠不要"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"電量為 <xliff:g id="PERCENT">%1$s</xliff:g> 時"</string>
@@ -2267,7 +2322,7 @@
     <string name="backup_data_summary" msgid="708773323451655666">"將應用程式資料、Wi-Fi 密碼及其他設定備份到 Google 伺服器"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"備份帳戶"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"包括應用程式資料"</string>
-    <string name="auto_restore_title" msgid="5397528966329126506">"自動還原功能"</string>
+    <string name="auto_restore_title" msgid="5397528966329126506">"自動還原"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"重新安裝應用程式時,還原備份的設定和資料"</string>
     <string name="backup_inactive_title" msgid="685838037986644604">"備份服務未啟用"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"目前沒有帳戶正在儲存備份資料"</string>
@@ -2370,6 +2425,8 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"確定要移除帳戶?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"移除帳戶後,平板電腦上所有的訊息、聯絡人和其他資料將全部遭到刪除!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"移除帳戶後,手機上所有的郵件、聯絡人和其他資料將全部遭到刪除!"</string>
+    <!-- no translation found for really_remove_account_message (7507474724882080166) -->
+    <skip />
     <string name="remove_account_failed" msgid="3901397272647112455">"你的管理員不允許這項變更"</string>
     <string name="provider_label" msgid="7724593781904508866">"發送訂閱"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2894,8 +2951,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"封鎖視覺干擾"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"允許視覺信號"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"新增"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"立即開啟"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"立即關閉"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"立即開啟"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"立即關閉"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"零打擾模式結束時間:<xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"零打擾模式會保持開啟,直到你關閉為止"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"規則 (<xliff:g id="RULE_NAME">%s</xliff:g>) 已將零打擾模式自動開啟"</string>
@@ -2934,7 +2991,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"應用程式通知"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"通知類別"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"通知類別群組"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"重要性"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"行為"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"開啟音效"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"一律不顯示通知"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"不發出音效或顯示通知"</string>
@@ -2952,6 +3009,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"中重要性"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"高重要性"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"緊急重要性"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"顯示通知"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"通知小幫手"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"通知存取權"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"管理員已禁止存取 Work 設定檔通知"</string>
@@ -2982,9 +3040,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"零打擾存取權"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"最近沒有已安裝的應用程式要求「零打擾」存取權"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"正在載入應用程式..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android 已設定封鎖,不讓這個應用程式的通知顯示在這個裝置上"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android 已設定封鎖,不讓這個類別的通知顯示在這個裝置上"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"Android 已設定封鎖,不讓這個群組的通知顯示在這個裝置上"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"Android 已根據你的要求設定封鎖,不讓這個應用程式的通知顯示在這個裝置上"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Android 已根據你的要求設定封鎖,不讓這個類別的通知顯示在這個裝置上"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Android 已根據你的要求設定封鎖,不讓這個群組的通知顯示在這個裝置上"</string>
     <string name="notification_channels" msgid="5346841743182627500">"類別"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"其他"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3563,31 +3621,10 @@
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"已連線到多個裝置"</string>
     <string name="demo_mode" msgid="2798762752209330277">"系統 UI 示範模式"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"快速設定開發人員圖塊"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"我們很樂意為你提供協助"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"我們隨時為你提供服務"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"我們隨時為你提供服務"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"我們的支援小組會協助你解決任何問題"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"我們的支援小組全年無休,隨時為你提供服務"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"搜尋相關說明或是於支援服務時間 (當地時間) 再次來電:&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"電話支援服務時間 (當地時間)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"搜尋相關說明,或是探索實用提示及秘訣"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"電話支援服務:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"人在國外嗎?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"可能需要支付國際通話費用"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"電話"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"即時通訊"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"探索實用提示及秘訣"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"搜尋說明及提供意見"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"與支援小組聯絡"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"登入"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"無法登入嗎?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"傳送系統資訊"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"不要再顯示"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"透過以下帳戶提出要求"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"新增帳戶"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"系統資訊"</string>
+    <!-- no translation found for window_trace_quick_settings_title (3839917000546526898) -->
+    <skip />
+    <!-- no translation found for layer_trace_quick_settings_title (2447147947568109649) -->
+    <skip />
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Work 設定檔設定"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"聯絡人搜尋"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"允許你的機構搜尋聯絡人,以便識別來電者和聯絡人的身分"</string>
@@ -3603,11 +3640,12 @@
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> 秒</item>
       <item quantity="one">1 秒</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"大約需等候 <xliff:g id="ESTIMATE">%1$s</xliff:g>"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"管理儲存空間"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"儲存空間管理員會將已備份的相片和影片從裝置中移除,藉此釋出儲存空間。"</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"移除相片和影片"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"儲存空間管理員"</string>
+    <!-- no translation found for automatic_storage_manager_master_switch_title (6792996736190821417) -->
+    <skip />
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"自動"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"手動"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"立即釋出空間"</string>
@@ -3773,8 +3811,10 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"認識你的新平板電腦"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"認識你的新裝置"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"這個裝置不支援此功能"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"強制啟用完整的 GNSS 測量資料"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"在停用工作週期的情況下追蹤所有 GNSS 星座圖和頻率"</string>
+    <!-- no translation found for storage_access (8905018810338984531) -->
     <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
+    <!-- no translation found for keywords_storage_access (3708874088152933579) -->
     <skip />
 </resources>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 20534f9..b7ff086 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -136,6 +136,20 @@
     <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>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Akukuhle"</item>
     <item msgid="2042505933058940139">"Akukuhle"</item>
@@ -476,4 +490,9 @@
     <item msgid="2900554746706302178">"Ngaphezulu kobudala obuyizinsuku ezingu-60"</item>
     <item msgid="5692284879054004388">"Ngaphezulu kobudala obuyizinsuku ezingu-90"</item>
   </string-array>
+  <string-array name="wifi_metered_entries">
+    <item msgid="2975784243692054526">"Sebenzisa izinketho zenethiwekhi"</item>
+    <item msgid="8745603368609022803">"Phatha njengokulinganisiwe"</item>
+    <item msgid="2266114985518865625">"Phatha njengokungalinganisiwe"</item>
+  </string-array>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 420ec71..704c64e 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -170,6 +170,8 @@
     <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Amadivayisi akho"</string>
     <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Bhanqa idivayisi entsha"</string>
     <string name="bluetooth_pref_summary" msgid="2606502649251443574">"Vumela idivayisi ukuthi ibhangqe iphinde ixhumeke kumadivayisi e-bluetooth"</string>
+    <string name="bluetooth_disable_inband_ringing" msgid="8919353393497325693">"Khubaza ukukhala okuphakathi nomkhiqizo"</string>
+    <string name="bluetooth_disable_inband_ringing_summary" msgid="7898974890913984364">"Ungadlali amathoni okukhala efoni kumahedisethi e-Bluetooth"</string>
     <string name="connected_device_connected_title" msgid="5871712271201945606">"Kuxhunyiwe manje"</string>
     <string name="connected_device_saved_title" msgid="688364359746674536">"Amadivayisi alondoloziwe"</string>
     <string name="connected_device_add_device_title" msgid="7803521577708810621">"Engeza idivayisi"</string>
@@ -330,6 +332,11 @@
     <string name="date_time_set_date" msgid="7021491668550232105">"Setha idethi"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Hlunga ngama-alfabethi"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Hlunga ngesikhathi somkhawulo"</string>
+    <string name="zone_change_to_from_dst" msgid="118656001224045590">"<xliff:g id="TIME_TYPE">%1$s</xliff:g> iqala ngo-<xliff:g id="TRANSITION_DATE">%2$s</xliff:g>."</string>
+    <string name="zone_time_type_dst" msgid="8850494578766845276">"Isikhathi sokulondoloza usuku"</string>
+    <string name="zone_time_type_standard" msgid="3462424485380376522">"Isikhathi esivamile"</string>
+    <string name="zone_menu_by_region" msgid="4603214570803607532">"Izoni yesikhathi ngesifunda"</string>
+    <string name="zone_menu_by_offset" msgid="1172774718486088771">"Amazoni esikhathi alungisiwe"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Idethi"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Isikhathi"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Ivalwe ngokuzenzakalelayo"</string>
@@ -348,6 +355,7 @@
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Ulwazi lwephrofayela"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Ama-akhawunti"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Indawo"</string>
+    <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Sebenzisa indawo"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Ama-akhawunti"</string>
     <string name="security_settings_title" msgid="4918904614964215087">"Ukuvikela nendawo"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Ukubethela nokuqinisekisa"</string>
@@ -691,6 +699,8 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Njenge sipikhafoni"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Komculo nemidiya"</string>
     <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="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>
@@ -705,6 +715,7 @@
     <string name="wifi_display_options_name" msgid="4756080222307467898">"Igama"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
+    <string name="wifi_sign_in_button_text" msgid="8404345621836792112">"Ngena ngemvume"</string>
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> ifuna ukuvula i-Wi-Fi"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> ifuna ukuvala i-Wi-Fi"</string>
@@ -722,6 +733,7 @@
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"I-Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Vula i-Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"I-Wi-Fi"</string>
+    <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Sebenzisa i-Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="8719175790520448014">"Izilungiselelo ze-Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"I-Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Hlela, uphathe izindawo zokungena ezingenantambo"</string>
@@ -833,7 +845,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (i-WPS iyatholakala)"</string>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Faka iphasiwedi yakho yenethiwekhi"</string>
     <string name="wifi_carrier_connect" msgid="8174696557882299911">"Inethiwekhi ye-Wi-Fi yenkampani yenethiwekhi"</string>
-    <string name="wifi_carrier_content" msgid="4634077285415851933">"Xhuma nge-<xliff:g id="NAME">%1%s</xliff:g>"</string>
+    <string name="wifi_carrier_content" msgid="4634077285415851933">"Xhuma nge-<xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Ukuze kuthuthukiswe ukufaneleka kwendawo nezinye izinjongo, i-<xliff:g id="APP_NAME">%1$s</xliff:g> ifuna ukuvula ukuskena kwenethiwekhi, noma ngabe i-Wi-Fi ivaliwe.\n\nVumela lokhu ngazo zonke izinhlelo zokusebenza ezifuna ukuskena?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Ukuze uvale lokhu, iya ku-Okuthuthukile kwimenyu yokuningi."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Vumela"</string>
@@ -909,10 +921,8 @@
     <string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"I-AP Band"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"Sebenzisa i-hotspot ukudala inethiwekhi ye-Wi‑Fi yamanye amadivayisi akho. I-Hotspot inikezela nge-inthanethi isebenzisa uxhumo lwedatha yakho yeselula. Amashaji edatha yeselula angeziwe angasebenza."</string>
     <string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"Izinhlelo zokusebenza zingadala i-hotspot ukwabelana ngokuqukethwe namadivayisi aseduze."</string>
-    <!-- no translation found for wifi_hotspot_auto_off_title (1590313508558948079) -->
-    <skip />
-    <!-- no translation found for wifi_hotspot_auto_off_summary (5858098059725925084) -->
-    <skip />
+    <string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"Vala ama-hotspot ngokuzenzakalela"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"I-Wi-Fi hotspot izovaleka uma kungekho amadivayisi axhunyiwe"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Ivula i-hotspot…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Ivala i-hotspot…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"I-<xliff:g id="NETWORK_SSID">%1$s</xliff:g> iyasebenza"</string>
@@ -961,6 +971,7 @@
     <string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
     <string name="emergency_address_title" msgid="932729250447887545">"Ikheli eliphuthumayo"</string>
     <string name="emergency_address_summary" msgid="7751971156196115129">"Isetshenziswa njengendawo yakho uma wenza ikholi ephuthumayo nge-Wi-Fi"</string>
+    <string name="private_dns_help_message" msgid="3299567069152568958"><annotation id="url">"Funda kabanzi"</annotation>" mayelana nezici ze-Private DNS"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ukubukeka"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Umsindo"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Amavolumu"</string>
@@ -1308,6 +1319,7 @@
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"I-<xliff:g id="NAME">^1</xliff:g> yakho entsha iyasebenza. \n\nUkuze uhambise izithombe, amafayela, nedatha yohlelo lokusebenza kule divayisi, hamba ku-Izilungiselelo &gt; Isitoreji."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Hambisa i-<xliff:g id="APP">^1</xliff:g>"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"Ukuhambisa i-<xliff:g id="APP">^1</xliff:g> kanye nedatha yayo ku-<xliff:g id="NAME_0">^2</xliff:g> kuzothatha izikhathi ezimbalwa kuphela. Ngeke uze ukwazi ukusebenzisa uhlelo lokusebenza kuze kube ukuhanjiswa kuqedile. \n\nUngasusi i-<xliff:g id="NAME_1">^2</xliff:g> ngesikhathi sokuhambisa."</string>
+    <string name="storage_wizard_move_unlock" msgid="1526216561023200694">"Ukuze uhambise idatha udinga ukuvula umsebenzisi <xliff:g id="APP">^1</xliff:g>."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"Ihambisa i-<xliff:g id="APP">^1</xliff:g>…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Ungasusi i-<xliff:g id="NAME">^1</xliff:g> ngesikhathi sokuhambisa. \n\nUhlelo lokusebenza lwe-<xliff:g id="APP">^2</xliff:g> kule divayisi ngeke luze lutholakale kuze kuqedwe ukuhambisa."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Khansela ukuhambisa"</string>
@@ -1469,6 +1481,7 @@
     <string name="location_sources_heading" msgid="1278732419851088319">"Imithombo yendawo"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Mayelana nethebhulethi"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Mayelana nefoni"</string>
+    <string name="about_settings" product="device" msgid="6717640957897546887">"Mayelana nedivayisi"</string>
     <string name="about_settings" product="emulator" msgid="221313099578564438">"Mayelana nedivayisi elinganisiwe"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Buka ulwazi lomthetho, umumo wefoni, inguqulo yesofthiwe"</string>
     <string name="legal_information" msgid="5769301644270604095">"Uwazi olusemthethweni"</string>
@@ -1576,6 +1589,7 @@
     <string name="see_all_apps_title" msgid="1317153498074308438">"Bona zonke izinhlelo zokusebenza ezingu-<xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="install_all_warning" product="tablet" msgid="8310489909586138165">"Ithebulethi yakho nedatha yomuntu siqu kusengcupheni enkulu ukuthi kungahlaselwa izinhlelo zokusebenza ezingaziwa. Ngokufaka izinhlelo zokusebenza kusukela kulo mthombo, uyavuma ukuthi unesibopho sanoma ikuphi ukonakala kuthebulethi yakho noma ukulahlekelwa idatha okungabangelwa ukusetshenziswa kwazo."</string>
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Ifoni yakho nedatha yomuntu siqu kusengcupheni enkulu ukuthi kungahlaselwa izinhlelo zokusebenza ezingaziwa. Ngokufaka izinhlelo zokusebenza kusukela kulo mthombo, uyavuma ukuthi unesibopho sanoma ikuphi ukonakala kufoni yakho noma ukulahlekelwa idatha okungabangelwa ukusetshenziswa kwazo."</string>
+    <string name="install_all_warning" product="device" msgid="3648003301476423145">"Idivayisi yakho nedatha yomuntu siqu isengcupheni enkulu ukuthi kungahlaselwa izinhlelo zokusebenza ezingaziwa. Ngokufaka izinhlelo zokusebenza kusukela kulo mthombo, uyavuma ukuthi unesibopho sanoma ikuphi ukonakala kudivayisi yakho noma ukulahlekelwa idatha okungabangelwa ukusetshenziswa kwazo."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Izilungiselelo ezithuthukisiwe"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Nima amandla izinketho eziphezulu zezilungiselelo"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Ulwazi lohlelo lokusebenza"</string>
@@ -1875,6 +1889,9 @@
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Ingaphazamisa ukusebenza"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Chofoza ngemuva kokuthi isikhombisi siyeke ukuhamba"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Bambezela ngaphambi kokuchofoza"</string>
+    <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="enable_quick_setting" msgid="2366999897816894536">"Bonisa Kuzilungiselelo Ezisheshayo"</string>
@@ -2031,14 +2048,35 @@
     <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Ivusa idivayisi ngasemuva"</string>
     <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Icela indawo njalo"</string>
     <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> izinhlelo zokusebenza ezingaziphathi kahle"</string>
-    <!-- no translation found for battery_tip_summary_title (7060523369832289878) -->
+    <string name="battery_tip_summary_title" msgid="7060523369832289878">"Ibhethri lisesimeni esihle"</string>
+    <string name="battery_tip_summary_summary" msgid="7832491466325707487">"Izinhlelo zokusebenza ziziphethe ngokujwayelekile"</string>
+    <string name="battery_tip_low_battery_title" msgid="5103420355109677385">"Amandla ebhethri aphansi"</string>
+    <string name="battery_tip_low_battery_summary" msgid="4702986182940709150">"Ibhethri alikwazi ukunikeza impilo enhle yebhethri"</string>
+    <string name="battery_tip_smart_battery_title" msgid="8471762806923764455">"Vula isiphathi sebhethri esihlakaniphile"</string>
+    <string name="battery_tip_smart_battery_summary" msgid="3024670691742861841">"Vula ukuze uthuthukise ukusebenza kwebhethri"</string>
+    <!-- no translation found for battery_tip_early_heads_up_title (1454605424618204941) -->
     <skip />
-    <!-- no translation found for battery_tip_summary_summary (7832491466325707487) -->
+    <!-- no translation found for battery_tip_early_heads_up_summary (4003736326324428487) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_title (5103420355109677385) -->
+    <!-- no translation found for battery_tip_early_heads_up_done_title (1545434816346760843) -->
     <skip />
-    <!-- no translation found for battery_tip_low_battery_summary (4702986182940709150) -->
+    <!-- no translation found for battery_tip_early_heads_up_done_summary (8191928150995385163) -->
     <skip />
+    <string name="battery_tip_high_usage_title" product="default" msgid="7981031050318555946">"Ifoni isetshenziswe kakhulu"</string>
+    <string name="battery_tip_high_usage_title" product="tablet" msgid="8767749911858231430">"Ithebhulethi isetshenziswe kakhulu"</string>
+    <string name="battery_tip_high_usage_title" product="device" msgid="4964729505519290954">"Idivayisi isetshenziswe kakhulu"</string>
+    <string name="battery_tip_high_usage_summary" msgid="5437023146333888605">"Cishe u-<xliff:g id="HOUR">%1$s</xliff:g> usetshenzisiwe kusuka ekushajeni okugcwele"</string>
+    <string name="battery_tip_dialog_message" product="default" msgid="6744251070067861233">"Ifoni yakho isetshenziswe kakhulu futhi lokhu kusebenzise ibhethri eliningi. Ibhethri lakho lisebenza kahle.\n\n Ifoni yakho isetshenziswe cishe izikhathi ezingu-<xliff:g id="HOUR">%1$s</xliff:g> kusuka ekushajeni okugcwele.\n\n Ukusebenzisa okuphelele:"</string>
+    <string name="battery_tip_dialog_message" product="tablet" msgid="7091442312127403445">"Ithebhulethi yakho isetshenziswe kakhulu futhi lokhu kusebenzise ibhethri eliningi. Ithebhulethi yakho isebenza kahle.\n\n Ifoni yakho isetshenziswe cishe izikhathi ezingu-<xliff:g id="HOUR">%1$s</xliff:g> kusuka ekushajeni okugcwele.\n\n Ukusebenzisa okuphelele:"</string>
+    <string name="battery_tip_dialog_message" product="device" msgid="7621045312469814256">"Idivayisi yakho isetshenziswe kakhulu futhi lokhu kusebenzise ibhethri eliningi. Ibhethri lakho lisebenza kahle.\n\n Idivayisi yakho isetshenziswe cishe izikhathi ezingu-<xliff:g id="HOUR">%1$s</xliff:g> kusuka ekushajeni okugcwele.\n\n Ukusebenzisa okuphelele:"</string>
+    <string name="smart_battery_manager_title" msgid="5677222263071864438">"Isiphathi sebhethri esihlakaniphile"</string>
+    <string name="smart_battery_title" msgid="7014692334636228916">"Phatha ngokuzenzakalela ibhethri"</string>
+    <string name="smart_battery_summary" msgid="6435844879637999044">"Lungisa ngokuzenzakalelayo ukusetshenziswa kwamandla ngezinhlelo zokusebenza ngokususelwe ekusebenzeni"</string>
+    <string name="restricted_app_title" msgid="8982477293044330653">"Izinhlelo zokusebenza ezikhawulelwe"</string>
+    <plurals name="restricted_app_summary" formatted="false" msgid="2541739220193274244">
+      <item quantity="one">%1$d izinhlelo zokusebenza</item>
+      <item quantity="other">%1$d izinhlelo zokusebenza</item>
+    </plurals>
     <string name="dialog_stop_title" msgid="6395127715596746479">"Misa uhlelo lokusebenza?"</string>
     <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Ifoni yakho ayikwazi ukuphatha ibhethri ngokujwayelekile ngoba i-<xliff:g id="APP">%1$s</xliff:g> igcina ifoni yakho ivukile.\n\nUkuze uzame ukulungisa le nkinga, ungamisa uhlelo lokusebenza.\n\nUma lokhu kuqhubeka ukwenzeka, kungenzeka kumele ukhiphe uhlelo lokusebenza ukuze uthuthukise ukusebenza kwebhethri."</string>
     <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Ithebulethi yakho ayikwazi ukuphatha ibhethri ngokujwayelekile ngoba i-<xliff:g id="APP">%1$s</xliff:g> igcina ithebulethi yakho ivukile.\n\nUkuze uzame ukulungisa le nkinga, ungamisa uhlelo lokusebenza.\n\nUma lokhu kuqhubeka ukwenzeka, kungenzeka kumele ukhiphe uhlelo lokusebenza ukuze uthuthukise ukusebenza kwebhethri."</string>
@@ -2147,6 +2185,7 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Iseva yemidiya"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Ukuthuthukisa kohlelo lokusebenza"</string>
     <string name="battery_saver" msgid="8172485772238572153">"Isilondolozi sebhethri"</string>
+    <string name="battery_saver_master_switch_title" msgid="622539414546588436">"Sebenzisa isilondolozi sebhethri"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Vula ngokuzenzakalela"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Akusoze"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"kokungu-<xliff:g id="PERCENT">%1$s</xliff:g> kubhethri"</string>
@@ -2367,6 +2406,7 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"Khipha i-akhawunti"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Ingabe ngempela ufuna ukukhipha le-akhawunti? Ukukukhipha kuzosusa yonke imiyalezo yayo, othintana nabo, neminye imininingo esuka kwi-tablet! BREAK"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Ingabe ngempela ufuna ukukhipha le-akhawunti? Ukukukhipha kuzosusa yonke imiyalezo yayo, othintana nabo, neminye imininingo esuka kwifoni! BREAK"</string>
+    <string name="really_remove_account_message" product="device" msgid="7507474724882080166">"Ingabe ngempela ufuna ukukhipha le-akhawunti? Ukukukhipha kuzosusa yonke imiyalezo yayo, othintana nabo, neminye imininingo esuka kudivayisi!"</string>
     <string name="remove_account_failed" msgid="3901397272647112455">"Lolu shintsho aluvunyelwe umlawuli wakho"</string>
     <string name="provider_label" msgid="7724593781904508866">"Dudula imali ekhishelwayo"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2891,8 +2931,8 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Vimbela ukuphazamiseka okubonakalayo"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"Vumela amasignali okubuka"</string>
     <string name="zen_mode_add" msgid="90014394953272517">"Engeza"</string>
-    <string name="zen_mode_button_turn_on" msgid="5074744714613374902">"VULA MANJE"</string>
-    <string name="zen_mode_button_turn_off" msgid="1995551537320422792">"VALA MANJE"</string>
+    <string name="zen_mode_button_turn_on" msgid="2824380626482175552">"Vula manje"</string>
+    <string name="zen_mode_button_turn_off" msgid="6181953727880503094">"Vala manje"</string>
     <string name="zen_mode_settings_dnd_manual_end_time" msgid="8860646554263965569">"Okuthi ungaphazamisi kuvuliwe kuze kube ngu-<xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_settings_dnd_manual_indefinite" msgid="7186615007561990908">"Okuthi Ungaphazamisi kuzohlala kuvuliwe uze ukuvale"</string>
     <string name="zen_mode_settings_dnd_automatic_rule" msgid="7780048616476170427">"Okuthi Ungaphazamisi kuvulwe ngokuzenzakalelayo ngomthetho (<xliff:g id="RULE_NAME">%s</xliff:g>)"</string>
@@ -2931,7 +2971,7 @@
     <string name="app_notifications_title" msgid="5810577805218003760">"Izaziso zohlelo lokusebenza"</string>
     <string name="notification_channel_title" msgid="2260666541030178452">"Isigaba sezaziso"</string>
     <string name="notification_group_title" msgid="7180506440133859601">"Iqembu lesigaba sesaziso"</string>
-    <string name="notification_importance_title" msgid="848692592679312666">"Ukubaluleka"</string>
+    <string name="notification_importance_title" msgid="4368578960344731828">"Ukuziphatha"</string>
     <string name="notification_importance_unspecified" msgid="6622173510486113958">"Vumela umsindo"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Ungalokothi ubonise izaziso"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Awukho umsindo noma ukuphazamiseka okubukwayo"</string>
@@ -2949,6 +2989,7 @@
     <string name="notification_channel_summary_low" msgid="322317684244981244">"Ukubaluleka okumaphakathi"</string>
     <string name="notification_channel_summary_default" msgid="1111749130423589931">"Ukubaluleka okuphezulu"</string>
     <string name="notification_channel_summary_high" msgid="2085017556511003283">"Ukubaluleka okusheshayo"</string>
+    <string name="notification_switch_label" msgid="6843075654538931025">"Bonisa izaziso"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Umsizi wesaziso"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Ukufinyelela isaziso"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Ukufinyelela kuzaziso zephrofayela yomsebenzi zivinjelwe"</string>
@@ -2979,9 +3020,9 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Ukufinyelela kokungaphazamisi"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Azikho izinhlelo zokusebenza ezifakiwe ezicele ukufinyelela kokungaphazamisi"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ilayisha izinhlelo zokusebenza..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"I-Android ivimbela izaziso zalolu hlelo lokusebenza kusukela ekuveleni kule divayisi"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"I-Android ivimbela lesi sigaba sezaziso kusukela ekuveleni kule divayisi"</string>
-    <string name="channel_group_notifications_off_desc" msgid="1620950416247316370">"I-Android ivimbela leli qembu lezaziso kusukela ekuveleni kule divayisi"</string>
+    <string name="app_notifications_off_desc" msgid="8289223211387083447">"Ngokwesicelo sakho, i-Android ivimbela izaziso zalolu hlelo lokusebenza kusukela ekuveleni kule divayisi"</string>
+    <string name="channel_notifications_off_desc" msgid="9013011134681491778">"Ngokwesicelo sakho i-Android ivimbela lesi sigaba sezaziso kusukela ekuveleni kule divayisi"</string>
+    <string name="channel_group_notifications_off_desc" msgid="2315252834146837470">"Ngokwesicelo sakho i-Android ivimbela leli qembu lezaziso kusukela ekuveleni kule divayisi"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Izigaba"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Okunye"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
@@ -3560,31 +3601,8 @@
     <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="quick_settings_developer_tiles" msgid="5947788063262762448">"Othayela bonjiniyela bezilungiselelo ezisheshayo"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"Silapha ukuze sisize"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Sikhona lapha kuwe ngokungu-24/7"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Sikhona lapha kuwe ngokungu-24 7"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"Ithimba lethu losekelo lilapha ukuze kusizwe kubhekelwe noma iyiphi inkinga"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Ithimba lethu losekelo liyatholakala usuku lonke nsuku zonke"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Sesha usizo noma ubuye ngesikhathi samahora osekelo (isikhathi sasendaweni):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Amahora osekelo lwefoni (isikhathi sasendaweni)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Sesha usizo noma hlola amathiphu namacebo"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"Usekelo lwe-:"</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="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
-    <string name="support_international_phone_title" msgid="1308334014138718455">"Uhambela amazwe aphesheya?"</string>
-    <string name="support_international_phone_summary" msgid="208231793637026927">"Izindleko zangamazwe zingasebenza"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Ifoni"</string>
-    <string name="support_escalation_by_chat" msgid="977019859110763749">"Ingxoxo"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Hlola amathiph namacebo"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Sesha usizo futhi uthumele impendulo"</string>
-    <string name="support_sign_in_required_title" msgid="1367187789121480440">"Xhumana nosekelo"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"Ngena ngemvume"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"Awukwazi ukungena ngemvume?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"Thumela ulwazi lwesistimu"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Ungabonisi futhi"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"Icela njengo"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"Engeza i-akhawunti"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"Ulwazi lwesistimu"</string>
+    <string name="window_trace_quick_settings_title" msgid="3839917000546526898">"Ukulandela kwewindi"</string>
+    <string name="layer_trace_quick_settings_title" msgid="2447147947568109649">"Ukulandela isendlalelo"</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>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Vumela usesho loxhumana naye ngenhlangano yakho ukuze ukhombe abashayayo noxhumana nabo"</string>
@@ -3600,11 +3618,11 @@
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> amasekhondi</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> amasekhondi</item>
     </plurals>
-    <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> linda"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"Phatha isitoreji"</string>
     <string name="automatic_storage_manager_text" msgid="4562950476680600604">"Ukuze kusizwe kukhululwe isikhala sesitoreji, isiphathi sesitoreji sisusa izithombe ezenziwe isipele namavidiyo kusukela kudivayisi yakho."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"Susa izithombe namavidiyo"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"Isiphathi sesitoreji"</string>
+    <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"Sebenzisa isiphathi sesitoreji"</string>
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"Okuzenzakalelayo"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"Okwenziwa ngesandla"</string>
     <string name="deletion_helper_preference_title" msgid="5271510052022285884">"Khulula isikhala manje"</string>
@@ -3770,8 +3788,8 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Thatha uhambo kuthebulethi yakho entsha"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Thatha uhambo lwedivayisi yakho entsha"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Lesi sici asitholakali kule divayisi"</string>
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking (1294470289520660584) -->
-    <skip />
-    <!-- no translation found for enable_gnss_raw_meas_full_tracking_summary (496344699046454200) -->
-    <skip />
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Phoqa izikali ezigcwele ze-GNSS"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Landelela onke ama-constellation nezimvamisa ngomjikelezo ongenawo umsebenzi"</string>
+    <string name="storage_access" msgid="8905018810338984531">"Ukufinyelela kwesotoreji"</string>
+    <string name="keywords_storage_access" msgid="3708874088152933579">"ukufinyelela kwesitoreji kuhleleke ngqo"</string>
 </resources>
diff --git a/res/values/bools.xml b/res/values/bools.xml
index e733d5f..e4a57ab 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -54,6 +54,9 @@
     surface in search results or not.-->
     <bool name="config_show_wifi_settings">true</bool>
 
+    <!-- Whether toggle_airplane is available or not. -->
+    <bool name="config_show_toggle_airplane">true</bool>
+
     <!-- Whether location mode is available or not. -->
     <bool name="config_location_mode_available">true</bool>
 
@@ -117,6 +120,24 @@
     <!-- Whether vibrate_input_devices should be shown or not. -->
     <bool name="config_show_vibrate_input_devices">true</bool>
 
+    <!-- Whether manage_device_admin should be shown or not. -->
+    <bool name="config_show_manage_device_admin">true</bool>
+
+    <!-- Whether unlock_set_or_change should be shown or not. -->
+    <bool name="config_show_unlock_set_or_change">true</bool>
+
+    <!-- Whether screen_pinning_settings should be shown or not. -->
+    <bool name="config_show_screen_pinning_settings">true</bool>
+
+    <!-- Whether manage_trust_agents should be shown or not. -->
+    <bool name="config_show_manage_trust_agents">true</bool>
+
+    <!-- Whether show_password should be shown or not. -->
+    <bool name="config_show_show_password">true</bool>
+
+    <!-- Whether trust_agent_click_intent should be shown or not. -->
+    <bool name="config_show_trust_agent_click_intent">true</bool>
+
     <!-- Whether wallpaper attribution should be shown or not. -->
     <bool name="config_show_wallpaper_attribution">true</bool>
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 00d9705..f8205e3 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -300,4 +300,11 @@
     <dimen name="suggestion_condition_header_padding_collapsed">10dp</dimen>
     <dimen name="suggestion_condition_header_padding_expanded">5dp</dimen>
 
+    <!-- Suggestion cards-->
+    <dimen name="suggestion_card_width_one_card">328dp</dimen>
+    <dimen name="suggestion_card_width_two_cards">158dp</dimen>
+    <dimen name="suggestion_card_width_multiple_cards">152dp</dimen>
+    <dimen name="suggestion_card_margin_end">12dp</dimen>
+    <dimen name="suggestion_card_padding_bottom_one_card">16dp</dimen>
+
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 46411e6..317a2f5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4813,6 +4813,14 @@
     <string name="battery_tip_smart_battery_title">Turn on smart battery manager</string>
     <!-- Summary for the smart battery tip [CHAR LIMIT=NONE] -->
     <string name="battery_tip_smart_battery_summary">Turn on to optimize battery usage</string>
+    <!-- Title for the early heads up tip [CHAR LIMIT=NONE] -->
+    <string name="battery_tip_early_heads_up_title">Turn on Low Battery Mode</string>
+    <!-- Summary for the early hedas up tip [CHAR LIMIT=NONE] -->
+    <string name="battery_tip_early_heads_up_summary">Extend your battery life</string>
+    <!-- Title when early heads up is solved [CHAR LIMIT=NONE] -->
+    <string name="battery_tip_early_heads_up_done_title">Low Battery Mode is on</string>
+    <!-- Summary when early heads up is solved [CHAR LIMIT=NONE] -->
+    <string name="battery_tip_early_heads_up_done_summary">Some features are limited</string>
     <!-- Title for the battery high usage tip [CHAR LIMIT=NONE] -->
     <string name="battery_tip_high_usage_title" product="default">Phone used heavily</string>
     <!-- Title for the battery high usage tip [CHAR LIMIT=NONE] -->
@@ -8401,6 +8409,9 @@
     <string name="condition_summary" translatable="false"><xliff:g name="count" example="3">%1$d</xliff:g></string>
 
     <!-- Title for the suggestions section on the dashboard [CHAR LIMIT=30] -->
+    <string name="suggestions_title_v2">Suggested for You</string>
+
+    <!-- Title for the suggestions section on the dashboard [CHAR LIMIT=30] -->
     <string name="suggestions_title">Suggestions</string>
 
     <!-- Summary for the suggestions section on the dashboard, representing number of suggestions. [CHAR LIMIT=10] -->
@@ -8666,6 +8677,9 @@
     <!-- Notification log debug tool: the word 'none' -->
     <string name="notification_log_details_ranking_none">Ranking object doesn\'t contain this key.</string>
 
+    <!-- [CHAR_LIMIT=NONE] Developer Settings: Title of the setting which turns on emulation of a display cutout. -->
+    <string name="display_cutout_emulation">Emulate a display with a cutout</string>
+
     <!-- [CHAR_LIMIT=60] Label for special access screen -->
     <string name="special_access">Special app access</string>
 
@@ -8732,7 +8746,7 @@
     <string name="window_trace_quick_settings_title">Window Trace</string>
 
     <!-- [CHAR LIMIT=25] Title of developer tile to toggle layer trace -->
-    <string name="layer_trace_quick_settings_title">Layer Trace</string>
+    <string name="layer_trace_quick_settings_title">Surface Trace</string>
 
     <!-- [CHAR LIMIT=60] Title of work profile setting page -->
     <string name="managed_profile_settings_title">Work profile settings</string>
@@ -9174,4 +9188,14 @@
     <!-- UI debug setting: preference summary - describes the behavior of forcing full raw GNSS satellite measurements [CHAR LIMIT=NONE] -->
     <string name="enable_gnss_raw_meas_full_tracking_summary">Track all GNSS constellations and frequencies with no duty cycling</string>
 
+    <!-- UI debug setting: preference title - show all crash dialogs [CHAR LIMIT=60] -->
+    <string name="show_first_crash_dialog">Always show crash dialog</string>
+    <!-- UI debug setting: preference summary - describes the behavior of showing a dialog every time an app crashes [CHAR LIMIT=NONE] -->
+    <string name="show_first_crash_dialog_summary">Show dialog every time an app crashes</string>
+
+    <!-- Title for Storage Access settings -->
+    <string name="storage_access">Storage access</string>
+    <!-- Keywords for Storage Access settings -->
+    <string name="keywords_storage_access">storage access scoped directory</string>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 579ee48..9555d5e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -316,6 +316,13 @@
     <style name="TextAppearance.RecentsTitle" parent="TextAppearance.CategoryTitle" />
     <style name="TextAppearance.ResultTitle" parent="TextAppearance.CategoryTitle" />
 
+    <style name="TextAppearance.SuggestionHeader"
+           parent="@android:style/TextAppearance.Material.Subhead">
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">?android:attr/colorAccent</item>
+    </style>
+
     <style name="TextAppearance.SuggestionTitle"
            parent="@android:style/TextAppearance.Material.Subhead">
         <item name="android:fontFamily">sans-serif-medium</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 4d7780c..d4ccdde 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -267,14 +267,6 @@
         <item name="android:actionBarStyle">@style/Theme.ActionBar</item>
     </style>
 
-    <style name="Theme.NotificationStation" parent="@style/Theme.Settings">
-        <!-- Redefine the ActionBar style for contentInsetStart -->
-        <item name="android:actionBarStyle">@style/Theme.ActionBar.SubSettings</item>
-        <item name="*android:actionBarSize">@dimen/actionbar_size</item>
-
-        <item name="preferenceBackgroundColor">@android:color/transparent</item>
-    </style>
-
     <style name="Theme.ConfirmDeviceCredentials" parent="Theme.SubSettings">
         <item name="confirmDeviceCredentialsSideMargin">@dimen/confirm_credentials_side_margin</item>
         <item name="confirmDeviceCredentialsTopMargin">@dimen/confirm_credentials_top_margin</item>
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index aad5d23..1daeb49 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -203,11 +203,6 @@
             android:summary="@string/wifi_verbose_logging_summary"/>
 
         <SwitchPreference
-            android:key="wifi_aggressive_handover"
-            android:title="@string/wifi_aggressive_handover"
-            android:summary="@string/wifi_aggressive_handover_summary"/>
-
-        <SwitchPreference
             android:key="wifi_allow_scan_with_traffic"
             android:title="@string/wifi_allow_scan_with_traffic"
             android:summary="@string/wifi_allow_scan_with_traffic_summary"/>
@@ -356,6 +351,10 @@
             android:key="density"
             android:title="@string/developer_smallest_width" />
 
+        <SwitchPreference
+            android:key="display_cutout_emulation"
+            android:title="@string/display_cutout_emulation" />
+
     </PreferenceCategory>
 
     <PreferenceCategory android:key="debug_hw_drawing_category"
@@ -459,6 +458,10 @@
                 android:fragment="com.android.settings.applications.appops.BackgroundCheckSummary"
                 android:title="@string/background_check_pref" />
 
+        <SwitchPreference
+            android:key="show_first_crash_dialog"
+            android:title="@string/show_first_crash_dialog"
+            android:summary="@string/show_first_crash_dialog_summary"/>
 
         <SwitchPreference
             android:key="show_all_anrs"
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 4b285d3..4d0c992 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -99,10 +99,11 @@
         android:fragment="com.android.settings.dream.DreamSettings" />
 
     <!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml -->
-    <Preference
+    <com.android.settingslib.RestrictedPreference
         android:key="ambient_display"
         android:title="@string/ambient_display_screen_title"
-        android:fragment="com.android.settings.display.AmbientDisplaySettings" />
+        android:fragment="com.android.settings.display.AmbientDisplaySettings"
+        settings:userRestriction="no_ambient_display" />
 
     <!-- Hide night mode for now
     <ListPreference
diff --git a/res/xml/power_usage_summary_legacy.xml b/res/xml/power_usage_summary_legacy.xml
index 5af6bc1..0038cc0 100644
--- a/res/xml/power_usage_summary_legacy.xml
+++ b/res/xml/power_usage_summary_legacy.xml
@@ -78,10 +78,11 @@
             android:entryValues="@array/screen_timeout_values"/>
 
         <!-- Cross-listed item, if you change this, also change it in display_settings.xml -->
-        <Preference
+        <com.android.settingslib.RestrictedPreference
             android:key="ambient_display_battery"
             android:title="@string/ambient_display_screen_title"
-            android:fragment="com.android.settings.display.AmbientDisplaySettings" />
+            android:fragment="com.android.settings.display.AmbientDisplaySettings"
+            settings:userRestriction="no_ambient_display" />
 
     </PreferenceCategory>
 
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index 616a08c..b5bfc49 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -149,18 +149,6 @@
           android:summary="%s" />
     </PreferenceCategory>
 
-    <com.android.settingslib.RestrictedPreference
-      android:key="cell_broadcast_settings"
-      android:title="@string/cell_broadcast_settings"
-      settings:useAdminDisabledSummary="true"
-      settings:allowDividerAbove="true"
-      android:order="-1">
-            <intent
-              android:action="android.intent.action.MAIN"
-              android:targetPackage="com.android.cellbroadcastreceiver"
-              android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings" />
-    </com.android.settingslib.RestrictedPreference>
-
     <com.android.settings.widget.WorkOnlyCategory
         android:key="sound_work_settings_section"
         android:title="@string/sound_work_settings"
diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index 829bc53..9980eb6 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -111,4 +111,16 @@
             android:value="com.android.settings.Settings$VrListenersSettingsActivity" />
     </Preference>
 
+<!-- TODO(b/63720392): add when ready
+    <Preference
+        android:key="special_app_storage_access"
+        android:title="@string/storage_access"
+        android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
+        settings:keywords="@string/keywords_storage_access">
+        <extra
+            android:name="classname"
+            android:value="com.android.settings.Settings$StorageAccessSettingsActivity" />
+    </Preference>
+ -->
+
 </PreferenceScreen>
diff --git a/src/com/android/settings/ApnPreference.java b/src/com/android/settings/ApnPreference.java
index 0111b26..4e89efc 100755
--- a/src/com/android/settings/ApnPreference.java
+++ b/src/com/android/settings/ApnPreference.java
@@ -16,11 +16,12 @@
 
 package com.android.settings;
 
+import static android.provider.Telephony.Carriers.FILTERED_URI;
+
 import android.content.ContentUris;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.provider.Telephony;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceViewHolder;
 import android.telephony.SubscriptionManager;
@@ -118,7 +119,7 @@
             Context context = getContext();
             if (context != null) {
                 int pos = Integer.parseInt(getKey());
-                Uri url = ContentUris.withAppendedId(Telephony.Carriers.CONTENT_URI, pos);
+                Uri url = ContentUris.withAppendedId(FILTERED_URI, pos);
                 Intent editIntent = new Intent(Intent.ACTION_EDIT, url);
                 editIntent.putExtra(ApnSettings.SUB_ID, mSubId);
                 context.startActivity(editIntent);
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index d554301..3628121 100755
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -16,6 +16,9 @@
 
 package com.android.settings;
 
+import static android.provider.Telephony.Carriers.ENFORCE_MANAGED_URI;
+import static android.provider.Telephony.Carriers.FILTERED_URI;
+
 import android.app.Activity;
 import android.app.Dialog;
 import android.app.ProgressDialog;
@@ -39,7 +42,6 @@
 import android.provider.Telephony;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceGroup;
-import android.support.v7.preference.PreferenceScreen;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
@@ -50,7 +52,6 @@
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.MotionEvent;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -246,6 +247,17 @@
         return null;
     }
 
+    private boolean isDpcApnEnforced() {
+        try (Cursor enforceCursor = getContentResolver().query(ENFORCE_MANAGED_URI,
+                null, null, null, null)) {
+            if (enforceCursor == null || enforceCursor.getCount() != 1) {
+                return false;
+            }
+            enforceCursor.moveToFirst();
+            return enforceCursor.getInt(0) > 0;
+        }
+    }
+
     private void fillList() {
         final TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
         final int subId = mSubscriptionInfo != null ? mSubscriptionInfo.getSubscriptionId()
@@ -259,9 +271,9 @@
             where.append(" AND NOT (type='ims')");
         }
 
-        Cursor cursor = getContentResolver().query(Telephony.Carriers.CONTENT_URI, new String[] {
-                "_id", "name", "apn", "type", "mvno_type", "mvno_match_data"}, where.toString(),
-                null, Telephony.Carriers.DEFAULT_SORT_ORDER);
+        Cursor cursor = getContentResolver().query(FILTERED_URI,
+                new String[] {"_id", "name", "apn", "type", "mvno_type", "mvno_match_data"},
+                where.toString(), null, Telephony.Carriers.DEFAULT_SORT_ORDER);
 
         if (cursor != null) {
             IccRecords r = null;
@@ -343,15 +355,14 @@
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        if (!mUnavailable) {
+        if (!mUnavailable && !isDpcApnEnforced()) {
             if (mAllowAddingApns) {
                 menu.add(0, MENU_NEW, 0,
                         getResources().getString(R.string.menu_new))
                         .setIcon(R.drawable.ic_menu_add_white)
                         .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
             }
-            menu.add(0, MENU_RESTORE, 0,
-                    getResources().getString(R.string.menu_restore))
+            menu.add(0, MENU_RESTORE, 0, getResources().getString(R.string.menu_restore))
                     .setIcon(android.R.drawable.ic_menu_upload);
         }
 
@@ -387,7 +398,7 @@
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
         int pos = Integer.parseInt(preference.getKey());
-        Uri url = ContentUris.withAppendedId(Telephony.Carriers.CONTENT_URI, pos);
+        Uri url = ContentUris.withAppendedId(FILTERED_URI, pos);
         startActivity(new Intent(Intent.ACTION_EDIT, url));
         return true;
     }
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 505977d..0269bb2 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -120,6 +120,7 @@
     public static class PhotosStorageActivity extends SettingsActivity {
         /* empty */
     }
+    public static class StorageAccessSettingsActivity extends SettingsActivity { /* empty */ }
 
     public static class TopLevelSettings extends SettingsActivity { /* empty */ }
     public static class ApnSettingsActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/SummaryPreference.java b/src/com/android/settings/SummaryPreference.java
index d129661..23965ee 100644
--- a/src/com/android/settings/SummaryPreference.java
+++ b/src/com/android/settings/SummaryPreference.java
@@ -21,7 +21,8 @@
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.TextView;
-import com.android.settings.applications.LinearColorBar;
+
+import com.android.settings.widget.LinearColorBar;
 
 /**
  * Provides a summary of a setting page in a preference.  Such as memory or data usage.
@@ -92,7 +93,7 @@
     public void onBindViewHolder(PreferenceViewHolder holder) {
         super.onBindViewHolder(holder);
 
-        LinearColorBar colorBar = (LinearColorBar) holder.itemView.findViewById(R.id.color_bar);
+        final LinearColorBar colorBar = holder.itemView.findViewById(R.id.color_bar);
 
         if (mChartEnabled) {
             colorBar.setVisibility(View.VISIBLE);
diff --git a/src/com/android/settings/applications/AppInfoBase.java b/src/com/android/settings/applications/AppInfoBase.java
index f20944d..0c96171 100644
--- a/src/com/android/settings/applications/AppInfoBase.java
+++ b/src/com/android/settings/applications/AppInfoBase.java
@@ -131,7 +131,7 @@
         if (mPackageName == null) {
             Intent intent = (args == null) ?
                     getActivity().getIntent() : (Intent) args.getParcelable("intent");
-            if (intent != null) {
+            if (intent != null && intent.getData() != null) {
                 mPackageName = intent.getData().getSchemeSpecificPart();
             }
         }
diff --git a/src/com/android/settings/applications/AppStateStorageAccessBridge.java b/src/com/android/settings/applications/AppStateStorageAccessBridge.java
new file mode 100644
index 0000000..4839fd6
--- /dev/null
+++ b/src/com/android/settings/applications/AppStateStorageAccessBridge.java
@@ -0,0 +1,88 @@
+/*
+ * 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;
+
+import static android.os.storage.StorageVolume.ScopedAccessProviderContract.AUTHORITY;
+import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PACKAGES;
+import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PACKAGES_COLUMNS;
+import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PACKAGES_COL_PACKAGE;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.util.ArraySet;
+import android.util.Log;
+
+import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+import com.android.settingslib.applications.ApplicationsState.AppFilter;
+
+import java.util.Set;
+
+// TODO(b/63720392): add unit tests
+public class AppStateStorageAccessBridge extends AppStateBaseBridge {
+
+    private static final String TAG = "StorageAccessBridge";
+
+    public AppStateStorageAccessBridge(ApplicationsState appState, Callback callback) {
+        super(appState, callback);
+    }
+
+    @Override
+    protected void loadAllExtraInfo() { }
+
+    @Override
+    protected void updateExtraInfo(AppEntry app, String pkg, int uid) { }
+
+    public static final AppFilter FILTER_APP_HAS_STORAGE_ACCESS = new AppFilter() {
+
+        private Set<String> mPackages;
+
+        @Override
+        public void init() {
+            throw new UnsupportedOperationException("Need to call constructor that takes context");
+        }
+
+        @Override
+        public void init(Context context) {
+            try (Cursor cursor = context.getContentResolver().query(
+                    new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT)
+                            .authority(AUTHORITY).appendPath(TABLE_PACKAGES).appendPath("*")
+                            .build(), TABLE_PACKAGES_COLUMNS, null, null)) {
+                if (cursor == null) {
+                    Log.w(TAG, "didn't get cursor");
+                    return;
+                }
+                final int count = cursor.getCount();
+                if (count == 0) {
+                    Log.d(TAG, "no packages");
+                    return;
+                }
+                mPackages = new ArraySet<>(count);
+                while (cursor.moveToNext()) {
+                    mPackages.add(cursor.getString(TABLE_PACKAGES_COL_PACKAGE));
+                }
+                Log.v(TAG, "init(): " + mPackages);
+            }
+        }
+
+        @Override
+        public boolean filterApp(AppEntry info) {
+            return mPackages != null && mPackages.contains(info.info.packageName);
+        }
+    };
+}
diff --git a/src/com/android/settings/applications/LinearColorBar.java b/src/com/android/settings/applications/LinearColorBar.java
deleted file mode 100644
index b637671..0000000
--- a/src/com/android/settings/applications/LinearColorBar.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/**
- *
- */
-package com.android.settings.applications;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.LinearGradient;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.graphics.Rect;
-import android.graphics.Shader;
-import android.util.AttributeSet;
-import android.util.DisplayMetrics;
-import android.view.MotionEvent;
-import android.widget.LinearLayout;
-import com.android.settings.Utils;
-
-public class LinearColorBar extends LinearLayout {
-
-    static final int RIGHT_COLOR = 0xffced7db;
-    static final int GRAY_COLOR = 0xff555555;
-    static final int WHITE_COLOR = 0xffffffff;
-
-    private float mRedRatio;
-    private float mYellowRatio;
-    private float mGreenRatio;
-
-    private int mLeftColor;
-    private int mMiddleColor;
-    private int mRightColor = RIGHT_COLOR;
-
-    private boolean mShowIndicator = true;
-    private boolean mShowingGreen;
-
-    private OnRegionTappedListener mOnRegionTappedListener;
-    private int mColoredRegions = REGION_RED | REGION_YELLOW | REGION_GREEN;
-
-    final Rect mRect = new Rect();
-    final Paint mPaint = new Paint();
-
-    int mLastInterestingLeft, mLastInterestingRight;
-    int mLineWidth;
-
-    int mLastLeftDiv, mLastRightDiv;
-    int mLastRegion;
-
-    final Path mColorPath = new Path();
-    final Path mEdgePath = new Path();
-    final Paint mColorGradientPaint = new Paint();
-    final Paint mEdgeGradientPaint = new Paint();
-
-    public static final int REGION_RED = 1<<0;
-    public static final int REGION_YELLOW = 1<<1;
-    public static final int REGION_GREEN = 1<<2;
-    public static final int REGION_ALL = REGION_RED | REGION_YELLOW | REGION_GREEN;
-
-    public interface OnRegionTappedListener {
-        public void onRegionTapped(int region);
-    }
-
-    public LinearColorBar(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        setWillNotDraw(false);
-        mPaint.setStyle(Paint.Style.FILL);
-        mColorGradientPaint.setStyle(Paint.Style.FILL);
-        mColorGradientPaint.setAntiAlias(true);
-        mEdgeGradientPaint.setStyle(Paint.Style.STROKE);
-        mLineWidth = getResources().getDisplayMetrics().densityDpi >= DisplayMetrics.DENSITY_HIGH
-                ? 2 : 1;
-        mEdgeGradientPaint.setStrokeWidth(mLineWidth);
-        mEdgeGradientPaint.setAntiAlias(true);
-        mLeftColor = mMiddleColor = Utils.getColorAccent(context);
-    }
-
-    public void setOnRegionTappedListener(OnRegionTappedListener listener) {
-        if (listener != mOnRegionTappedListener) {
-            mOnRegionTappedListener = listener;
-            setClickable(listener != null);
-        }
-    }
-
-    public void setColoredRegions(int regions) {
-        mColoredRegions = regions;
-        invalidate();
-    }
-
-    public void setRatios(float red, float yellow, float green) {
-        mRedRatio = red;
-        mYellowRatio = yellow;
-        mGreenRatio = green;
-        invalidate();
-    }
-
-    public void setColors(int red, int yellow, int green) {
-        mLeftColor = red;
-        mMiddleColor = yellow;
-        mRightColor = green;
-        updateIndicator();
-        invalidate();
-    }
-
-    public void setShowIndicator(boolean showIndicator) {
-        mShowIndicator = showIndicator;
-        updateIndicator();
-        invalidate();
-    }
-
-    public void setShowingGreen(boolean showingGreen) {
-        if (mShowingGreen != showingGreen) {
-            mShowingGreen = showingGreen;
-            updateIndicator();
-            invalidate();
-        }
-    }
-
-    private void updateIndicator() {
-        int off = getPaddingTop() - getPaddingBottom();
-        if (off < 0) off = 0;
-        mRect.top = off;
-        mRect.bottom = getHeight();
-        if (!mShowIndicator) {
-            return;
-        }
-        if (mShowingGreen) {
-            mColorGradientPaint.setShader(new LinearGradient(
-                    0, 0, 0, off-2, mRightColor &0xffffff, mRightColor, Shader.TileMode.CLAMP));
-        } else {
-            mColorGradientPaint.setShader(new LinearGradient(
-                    0, 0, 0, off-2, mMiddleColor&0xffffff, mMiddleColor, Shader.TileMode.CLAMP));
-        }
-        mEdgeGradientPaint.setShader(new LinearGradient(
-                0, 0, 0, off/2, 0x00a0a0a0, 0xffa0a0a0, Shader.TileMode.CLAMP));
-    }
-
-    @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-        super.onSizeChanged(w, h, oldw, oldh);
-        updateIndicator();
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        if (mOnRegionTappedListener != null) {
-            switch (event.getAction()) {
-                case MotionEvent.ACTION_DOWN: {
-                    final int x = (int) event.getX();
-                    if (x < mLastLeftDiv) {
-                        mLastRegion = REGION_RED;
-                    } else if (x < mLastRightDiv) {
-                        mLastRegion = REGION_YELLOW;
-                    } else {
-                        mLastRegion = REGION_GREEN;
-                    }
-                    invalidate();
-                } break;
-            }
-        }
-        return super.onTouchEvent(event);
-    }
-
-    @Override
-    protected void dispatchSetPressed(boolean pressed) {
-        invalidate();
-    }
-
-    @Override
-    public boolean performClick() {
-        if (mOnRegionTappedListener != null && mLastRegion != 0) {
-            mOnRegionTappedListener.onRegionTapped(mLastRegion);
-            mLastRegion = 0;
-        }
-        return super.performClick();
-    }
-
-    private int pickColor(int color, int region) {
-        if (isPressed() && (mLastRegion&region) != 0) {
-            return WHITE_COLOR;
-        }
-        if ((mColoredRegions&region) == 0) {
-            return GRAY_COLOR;
-        }
-        return color;
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-
-        int width = getWidth();
-
-        int left = 0;
-
-        int right = left + (int)(width*mRedRatio);
-        int right2 = right + (int)(width*mYellowRatio);
-        int right3 = right2 + (int)(width*mGreenRatio);
-
-        int indicatorLeft, indicatorRight;
-        if (mShowingGreen) {
-            indicatorLeft = right2;
-            indicatorRight = right3;
-        } else {
-            indicatorLeft = right;
-            indicatorRight = right2;
-        }
-
-        if (mLastInterestingLeft != indicatorLeft || mLastInterestingRight != indicatorRight) {
-            mColorPath.reset();
-            mEdgePath.reset();
-            if (mShowIndicator && indicatorLeft < indicatorRight) {
-                final int midTopY = mRect.top;
-                final int midBottomY = 0;
-                final int xoff = 2;
-                mColorPath.moveTo(indicatorLeft, mRect.top);
-                mColorPath.cubicTo(indicatorLeft, midBottomY,
-                        -xoff, midTopY,
-                        -xoff, 0);
-                mColorPath.lineTo(width+xoff-1, 0);
-                mColorPath.cubicTo(width+xoff-1, midTopY,
-                        indicatorRight, midBottomY,
-                        indicatorRight, mRect.top);
-                mColorPath.close();
-                final float lineOffset = mLineWidth+.5f;
-                mEdgePath.moveTo(-xoff+lineOffset, 0);
-                mEdgePath.cubicTo(-xoff+lineOffset, midTopY,
-                        indicatorLeft+lineOffset, midBottomY,
-                        indicatorLeft+lineOffset, mRect.top);
-                mEdgePath.moveTo(width+xoff-1-lineOffset, 0);
-                mEdgePath.cubicTo(width+xoff-1-lineOffset, midTopY,
-                        indicatorRight-lineOffset, midBottomY,
-                        indicatorRight-lineOffset, mRect.top);
-            }
-            mLastInterestingLeft = indicatorLeft;
-            mLastInterestingRight = indicatorRight;
-        }
-
-        if (!mEdgePath.isEmpty()) {
-            canvas.drawPath(mEdgePath, mEdgeGradientPaint);
-            canvas.drawPath(mColorPath, mColorGradientPaint);
-        }
-
-        if (left < right) {
-            mRect.left = left;
-            mRect.right = right;
-            mPaint.setColor(pickColor(mLeftColor, REGION_RED));
-            canvas.drawRect(mRect, mPaint);
-            width -= (right-left);
-            left = right;
-        }
-
-        mLastLeftDiv = right;
-        mLastRightDiv = right2;
-
-        right = right2;
-
-        if (left < right) {
-            mRect.left = left;
-            mRect.right = right;
-            mPaint.setColor(pickColor(mMiddleColor, REGION_YELLOW));
-            canvas.drawRect(mRect, mPaint);
-            width -= (right-left);
-            left = right;
-        }
-
-
-        right = left + width;
-        if (left < right) {
-            mRect.left = left;
-            mRect.right = right;
-            mPaint.setColor(pickColor(mRightColor, REGION_GREEN));
-            canvas.drawRect(mRect, mPaint);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/applications/RunningProcessesView.java b/src/com/android/settings/applications/RunningProcessesView.java
index b365435..dd8bcf8 100644
--- a/src/com/android/settings/applications/RunningProcessesView.java
+++ b/src/com/android/settings/applications/RunningProcessesView.java
@@ -43,6 +43,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
+import com.android.settings.widget.LinearColorBar;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/android/settings/applications/StorageAccessDetails.java b/src/com/android/settings/applications/StorageAccessDetails.java
new file mode 100644
index 0000000..41729e6
--- /dev/null
+++ b/src/com/android/settings/applications/StorageAccessDetails.java
@@ -0,0 +1,110 @@
+/*
+ * 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;
+
+import static android.os.storage.StorageVolume.ScopedAccessProviderContract.AUTHORITY;
+import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS;
+import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS_COLUMNS;
+import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS_COL_DIRECTORY;
+import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS_COL_GRANTED;
+import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS_COL_PACKAGE;
+import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS_COL_VOLUME_UUID;
+
+import android.app.AlertDialog;
+import android.content.ContentResolver;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.Preference.OnPreferenceChangeListener;
+import android.support.v7.preference.Preference.OnPreferenceClickListener;
+import android.util.Log;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+
+/**
+ * Detailed settings for an app's storage access permissions (A.K.A Scoped Directory Access).
+ */
+// TODO(b/63720392): explain its layout
+// TODO(b/63720392): add unit tests
+public class StorageAccessDetails extends AppInfoWithHeader implements OnPreferenceChangeListener,
+        OnPreferenceClickListener {
+    private static final String MY_TAG = "StorageAccessDetails";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (true) {
+            // TODO(b/63720392): temporarily hack so the screen doesn't crash..
+            addPreferencesFromResource(R.xml.app_ops_permissions_details);
+            // ... we need to dynamically create the preferences by calling the provider instead:
+            try (Cursor cursor = getContentResolver().query(
+                    new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT)
+                            .authority(AUTHORITY).appendPath(TABLE_PERMISSIONS).appendPath("*")
+                            .build(),
+                    TABLE_PERMISSIONS_COLUMNS, null, null)) {
+                if (cursor == null) {
+                    Log.w(TAG, "didn't get cursor");
+                    return;
+                }
+                final int count = cursor.getCount();
+                if (count == 0) {
+                    Log.d(TAG, "no permissions");
+                    return;
+                }
+                while (cursor.moveToNext()) {
+                    final String pkg = cursor.getString(TABLE_PERMISSIONS_COL_PACKAGE);
+                    final String uuid = cursor.getString(TABLE_PERMISSIONS_COL_VOLUME_UUID);
+                    final String dir = cursor.getString(TABLE_PERMISSIONS_COL_DIRECTORY);
+                    final boolean granted = cursor.getInt(TABLE_PERMISSIONS_COL_GRANTED) == 1;
+                    Log.v(MY_TAG, "pkg:" + pkg + " uuid: " + uuid + " dir: " + dir + "> "
+                            + granted);
+                }
+            }
+        }
+    }
+
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+        // TODO(b/63720392): implement or remove listener
+        return false;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        // TODO(b/63720392): implement or remove listener
+        return false;
+    }
+
+    @Override
+    protected boolean refreshUi() {
+        // TODO(b/63720392): implement
+        return true;
+    }
+
+    @Override
+    protected AlertDialog createDialog(int id, int errorCode) {
+        return null;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.APPLICATIONS_USAGE_ACCESS_DETAIL;
+    }
+}
diff --git a/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java b/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java
index c644648..4b7631a 100644
--- a/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java
@@ -29,9 +29,11 @@
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
 
 public class AppHeaderViewPreferenceController extends BasePreferenceController
-        implements AppInfoDashboardFragment.Callback {
+        implements AppInfoDashboardFragment.Callback, LifecycleObserver, OnStart {
 
     private static final String KEY_HEADER = "header_view";
 
@@ -40,12 +42,17 @@
     private final String mPackageName;
     private final Lifecycle mLifecycle;
 
+    private EntityHeaderController mEntityHeaderController;
+
     public AppHeaderViewPreferenceController(Context context, AppInfoDashboardFragment parent,
             String packageName, Lifecycle lifecycle) {
         super(context, KEY_HEADER);
         mParent = parent;
         mPackageName = packageName;
         mLifecycle = lifecycle;
+        if (mLifecycle != null) {
+            mLifecycle.addObserver(this);
+        }
     }
 
     @Override
@@ -58,18 +65,22 @@
         super.displayPreference(screen);
         mHeader = (LayoutPreference) screen.findPreference(KEY_HEADER);
         final Activity activity = mParent.getActivity();
-        EntityHeaderController
+        mEntityHeaderController = EntityHeaderController
                 .newInstance(activity, mParent, mHeader.findViewById(R.id.entity_header))
-                .setRecyclerView(mParent.getListView(), mLifecycle)
                 .setPackageName(mPackageName)
-                .setHasAppInfoLink(false)
                 .setButtonActions(EntityHeaderController.ActionType.ACTION_APP_PREFERENCE,
                         EntityHeaderController.ActionType.ACTION_NONE)
-                .styleActionBar(activity)
                 .bindHeaderButtons();
     }
 
     @Override
+    public void onStart() {
+        mEntityHeaderController
+                .setRecyclerView(mParent.getListView(), mLifecycle)
+                .styleActionBar(mParent.getActivity());
+    }
+
+    @Override
     public void refreshUi() {
         setAppLabelAndIcon(mParent.getPackageInfo(), mParent.getAppEntry());
     }
@@ -80,13 +91,11 @@
         final boolean isInstantApp = AppUtils.isInstant(pkgInfo.applicationInfo);
         final CharSequence summary = isInstantApp
                 ? null : mContext.getString(Utils.getInstallationStatus(appEntry.info));
-        EntityHeaderController
-                .newInstance(activity, mParent, mHeader.findViewById(R.id.entity_header))
+        mEntityHeaderController
                 .setLabel(appEntry)
                 .setIcon(appEntry)
                 .setSummary(summary)
                 .setIsInstantApp(isInstantApp)
                 .done(activity, false /* rebindActions */);
     }
-
 }
diff --git a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
index 01d2cb8..82b3d86 100644
--- a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
+++ b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
@@ -23,6 +23,7 @@
 import com.android.settings.applications.AppStateNotificationBridge;
 import com.android.settings.applications.AppStateOverlayBridge;
 import com.android.settings.applications.AppStatePowerBridge;
+import com.android.settings.applications.AppStateStorageAccessBridge;
 import com.android.settings.applications.AppStateUsageBridge;
 import com.android.settings.applications.AppStateWriteSettingsBridge;
 import com.android.settingslib.applications.ApplicationsState;
@@ -65,14 +66,15 @@
     public static final int FILTER_APPS_WITH_OVERLAY = 10;
     public static final int FILTER_APPS_WRITE_SETTINGS = 11;
     public static final int FILTER_APPS_INSTALL_SOURCES = 12;
-    // Next id: 13
+    public static final int FILTER_APP_HAS_STORAGE_ACCESS = 13;
+    // Next id: 14
 
     private static AppFilterRegistry sRegistry;
 
     private final AppFilterItem[] mFilters;
 
     private AppFilterRegistry() {
-        mFilters = new AppFilterItem[13];
+        mFilters = new AppFilterItem[14];
 
         // High power whitelist, on
         mFilters[FILTER_APPS_POWER_WHITELIST] = new AppFilterItem(
@@ -155,6 +157,12 @@
                 AppStateInstallAppsBridge.FILTER_APP_SOURCES,
                 FILTER_APPS_INSTALL_SOURCES,
                 R.string.filter_install_sources_apps);
+
+        // Apps that interacted with storage access permissions (A.K.A. Scoped Directory Access)
+        mFilters[FILTER_APP_HAS_STORAGE_ACCESS] = new AppFilterItem(
+                AppStateStorageAccessBridge.FILTER_APP_HAS_STORAGE_ACCESS,
+                FILTER_APP_HAS_STORAGE_ACCESS,
+                R.string.filter_install_sources_apps);
     }
 
     public static AppFilterRegistry getInstance() {
@@ -177,6 +185,8 @@
                 return FILTER_APPS_WRITE_SETTINGS;
             case ManageApplications.LIST_TYPE_MANAGE_SOURCES:
                 return FILTER_APPS_INSTALL_SOURCES;
+            case ManageApplications.LIST_TYPE_STORAGE_ACCESS:
+                return FILTER_APP_HAS_STORAGE_ACCESS;
             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 dcdd3b8..081161e 100644
--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -84,6 +84,7 @@
 import com.android.settings.applications.AppStateNotificationBridge;
 import com.android.settings.applications.AppStateOverlayBridge;
 import com.android.settings.applications.AppStatePowerBridge;
+import com.android.settings.applications.AppStateStorageAccessBridge;
 import com.android.settings.applications.AppStateUsageBridge;
 import com.android.settings.applications.AppStateUsageBridge.UsageState;
 import com.android.settings.applications.AppStateWriteSettingsBridge;
@@ -92,6 +93,7 @@
 import com.android.settings.applications.InstalledAppCounter;
 import com.android.settings.applications.InstalledAppDetails;
 import com.android.settings.applications.NotificationApps;
+import com.android.settings.applications.StorageAccessDetails;
 import com.android.settings.applications.UsageAccessDetails;
 import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
 import com.android.settings.applications.appinfo.DrawOverlayDetails;
@@ -204,6 +206,7 @@
     public static final int LIST_TYPE_GAMES = 9;
     public static final int LIST_TYPE_MOVIES = 10;
     public static final int LIST_TYPE_PHOTOGRAPHY = 11;
+    public static final int LIST_TYPE_STORAGE_ACCESS = 12;
 
     // List types that should show instant apps.
     public static final Set<Integer> LIST_TYPES_WITH_INSTANT = new ArraySet<>(Arrays.asList(
@@ -279,6 +282,9 @@
             mListType = LIST_TYPE_PHOTOGRAPHY;
             mSortOrder = R.id.sort_order_size;
             mStorageType = args.getInt(EXTRA_STORAGE_TYPE, STORAGE_TYPE_DEFAULT);
+        } else if (className.equals(Settings.StorageAccessSettingsActivity.class.getName())) {
+            mListType = LIST_TYPE_STORAGE_ACCESS;
+            screenTitle = R.string.storage_access;
         } else {
             mListType = LIST_TYPE_MAIN;
         }
@@ -443,6 +449,8 @@
                 return MetricsEvent.SYSTEM_ALERT_WINDOW_APPS;
             case LIST_TYPE_MANAGE_SOURCES:
                 return MetricsEvent.MANAGE_EXTERNAL_SOURCES;
+            case LIST_TYPE_STORAGE_ACCESS:
+                return MetricsEvent.STORAGE_ACCESS;
             default:
                 return MetricsEvent.VIEW_UNKNOWN;
         }
@@ -537,6 +545,10 @@
             case LIST_TYPE_PHOTOGRAPHY:
                 startAppInfoFragment(AppStorageSettings.class, R.string.storage_photos_videos);
                 break;
+            case LIST_TYPE_STORAGE_ACCESS:
+                startAppInfoFragment(StorageAccessDetails.class, R.string.storage_access);
+                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.
@@ -840,6 +852,8 @@
                 mExtraInfoBridge = new AppStateWriteSettingsBridge(mContext, mState, this);
             } else if (mManageApplications.mListType == LIST_TYPE_MANAGE_SOURCES) {
                 mExtraInfoBridge = new AppStateInstallAppsBridge(mContext, mState, this);
+            } else if (mManageApplications.mListType == LIST_TYPE_STORAGE_ACCESS) {
+                mExtraInfoBridge = new AppStateStorageAccessBridge(mState, this);
             } else {
                 mExtraInfoBridge = null;
             }
@@ -1241,6 +1255,9 @@
                 case LIST_TYPE_MANAGE_SOURCES:
                     holder.setSummary(ExternalSourcesDetails.getPreferenceSummary(mContext, entry));
                     break;
+                case LIST_TYPE_STORAGE_ACCESS:
+                    holder.setSummary(null);
+                    break;
                 default:
                     holder.updateSizeText(entry, mManageApplications.mInvalidSizeStr, mWhichSize);
                     break;
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
index 9898c33..127730b 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
@@ -176,7 +176,6 @@
                     new BluetoothDevicePreference(mPrefContext, cachedDevice,
                             mShowDeviceWithoutNames);
             btPreference.setOnGearClickListener(mDeviceProfilesListener);
-            btPreference.setSummary(R.string.summary_placeholder);
             mPreferenceMap.put(device, btPreference);
             mDevicePreferenceCallback.onDeviceAdded(btPreference);
         }
diff --git a/src/com/android/settings/core/FeatureFlags.java b/src/com/android/settings/core/FeatureFlags.java
index 7d9b331..4b5ce78 100644
--- a/src/com/android/settings/core/FeatureFlags.java
+++ b/src/com/android/settings/core/FeatureFlags.java
@@ -20,11 +20,11 @@
  * This class keeps track of all feature flags in Settings.
  */
 public class FeatureFlags {
-    public static final String SEARCH_V2 = "settings_search_v2";
     public static final String APP_INFO_V2 = "settings_app_info_v2";
     public static final String CONNECTED_DEVICE_V2 = "settings_connected_device_v2";
     public static final String BATTERY_SETTINGS_V2 = "settings_battery_v2";
     public static final String BATTERY_DISPLAY_APP_LIST = "settings_battery_display_app_list";
     public static final String SECURITY_SETTINGS_V2 = "settings_security_settings_v2";
     public static final String ZONE_PICKER_V2 = "settings_zone_picker_v2";
+    public static final String SUGGESTION_UI_V2 = "settings_suggestion_ui_v2";
 }
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 44f576c..71ff610 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -44,6 +44,7 @@
 import com.android.settings.applications.NotificationApps;
 import com.android.settings.applications.ProcessStatsSummary;
 import com.android.settings.applications.ProcessStatsUi;
+import com.android.settings.applications.StorageAccessDetails;
 import com.android.settings.applications.UsageAccessDetails;
 import com.android.settings.applications.VrListenerSettings;
 import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
@@ -252,7 +253,8 @@
             WebViewAppPicker.class.getName(),
             LockscreenDashboardFragment.class.getName(),
             BluetoothDeviceDetailsFragment.class.getName(),
-            DataUsageList.class.getName()
+            DataUsageList.class.getName(),
+            StorageAccessDetails.class.getName()
     };
 
     public static final String[] SETTINGS_FOR_RESTRICTED = {
diff --git a/src/com/android/settings/dashboard/DashboardAdapterV2.java b/src/com/android/settings/dashboard/DashboardAdapterV2.java
new file mode 100644
index 0000000..cc511c5
--- /dev/null
+++ b/src/com/android/settings/dashboard/DashboardAdapterV2.java
@@ -0,0 +1,442 @@
+/*
+ * 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.dashboard;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Icon;
+import android.os.Bundle;
+import android.service.settings.suggestions.Suggestion;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.util.DiffUtil;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.util.ArrayMap;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.R.id;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.dashboard.DashboardDataV2.ConditionHeaderData;
+import com.android.settings.dashboard.conditional.Condition;
+import com.android.settings.dashboard.conditional.ConditionAdapterV2;
+import com.android.settings.dashboard.suggestions.SuggestionAdapterV2;
+import com.android.settings.dashboard.suggestions.SuggestionControllerMixin;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
+import com.android.settingslib.drawer.DashboardCategory;
+import com.android.settingslib.drawer.Tile;
+
+import java.util.List;
+
+public class DashboardAdapterV2 extends RecyclerView.Adapter<DashboardAdapterV2.DashboardItemHolder>
+        implements SummaryLoader.SummaryConsumer, SuggestionAdapterV2.Callback, LifecycleObserver,
+        OnSaveInstanceState {
+    public static final String TAG = "DashboardAdapterV2";
+    private static final String STATE_CATEGORY_LIST = "category_list";
+
+    @VisibleForTesting
+    static final String STATE_CONDITION_EXPANDED = "condition_expanded";
+
+    private final IconCache mCache;
+    private final Context mContext;
+    private final MetricsFeatureProvider mMetricsFeatureProvider;
+    private final DashboardFeatureProvider mDashboardFeatureProvider;
+    private boolean mFirstFrameDrawn;
+    private RecyclerView mRecyclerView;
+    private SuggestionAdapterV2 mSuggestionAdapter;
+
+    @VisibleForTesting
+    DashboardDataV2 mDashboardData;
+
+    private View.OnClickListener mTileClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            //TODO: get rid of setTag/getTag
+            mDashboardFeatureProvider.openTileIntent((Activity) mContext, (Tile) v.getTag());
+        }
+    };
+
+    public DashboardAdapterV2(Context context, Bundle savedInstanceState,
+            List<Condition> conditions, SuggestionControllerMixin suggestionControllerMixin,
+            Lifecycle lifecycle) {
+
+        DashboardCategory category = null;
+        boolean conditionExpanded = false;
+
+        mContext = context;
+        final FeatureFactory factory = FeatureFactory.getFactory(context);
+        mMetricsFeatureProvider = factory.getMetricsFeatureProvider();
+        mDashboardFeatureProvider = factory.getDashboardFeatureProvider(context);
+        mCache = new IconCache(context);
+        mSuggestionAdapter = new SuggestionAdapterV2(mContext, suggestionControllerMixin,
+            savedInstanceState, this /* callback */, lifecycle);
+
+        setHasStableIds(true);
+
+        if (savedInstanceState != null) {
+            category = savedInstanceState.getParcelable(STATE_CATEGORY_LIST);
+            conditionExpanded = savedInstanceState.getBoolean(
+                    STATE_CONDITION_EXPANDED, conditionExpanded);
+        }
+
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+
+        mDashboardData = new DashboardDataV2.Builder()
+            .setConditions(conditions)
+            .setSuggestions(mSuggestionAdapter.getSuggestions())
+            .setCategory(category)
+            .setConditionExpanded(conditionExpanded)
+            .build();
+    }
+
+    public void setSuggestions(List<Suggestion> data) {
+        final DashboardDataV2 prevData = mDashboardData;
+        mDashboardData = new DashboardDataV2.Builder(prevData)
+                .setSuggestions(data)
+                .build();
+        notifyDashboardDataChanged(prevData);
+    }
+
+    public void setCategory(DashboardCategory category) {
+        tintIcons(category);
+        final DashboardDataV2 prevData = mDashboardData;
+        Log.d(TAG, "adapter setCategory called");
+        mDashboardData = new DashboardDataV2.Builder(prevData)
+                .setCategory(category)
+                .build();
+        notifyDashboardDataChanged(prevData);
+    }
+
+    public void setConditions(List<Condition> conditions) {
+        final DashboardDataV2 prevData = mDashboardData;
+        Log.d(TAG, "adapter setConditions called");
+        mDashboardData = new DashboardDataV2.Builder(prevData)
+                .setConditions(conditions)
+                .build();
+        notifyDashboardDataChanged(prevData);
+    }
+
+    @Override
+    public void onSuggestionClosed(Suggestion suggestion) {
+        final List<Suggestion> list = mDashboardData.getSuggestions();
+        if (list == null || list.size() == 0) {
+            return;
+        }
+        if (list.size() == 1) {
+            // The only suggestion is dismissed, and the the empty suggestion container will
+            // remain as the dashboard item. Need to refresh the dashboard list.
+            final DashboardDataV2 prevData = mDashboardData;
+            mDashboardData = new DashboardDataV2.Builder(prevData)
+                .setSuggestions(null)
+                .build();
+            notifyDashboardDataChanged(prevData);
+        } else {
+            mSuggestionAdapter.removeSuggestion(suggestion);
+        }
+    }
+
+    @Override
+    public void notifySummaryChanged(Tile tile) {
+        final int position = mDashboardData.getPositionByTile(tile);
+        if (position != DashboardDataV2.POSITION_NOT_FOUND) {
+            // Since usually tile in parameter and tile in mCategories are same instance,
+            // which is hard to be detected by DiffUtil, so we notifyItemChanged directly.
+            notifyItemChanged(position, mDashboardData.getItemTypeByPosition(position));
+        }
+    }
+
+    @Override
+    public DashboardItemHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        final View view = LayoutInflater.from(parent.getContext()).inflate(viewType, parent, false);
+        if (viewType == R.layout.suggestion_condition_header) {
+            return new ConditionHeaderHolder(view);
+        }
+        if (viewType == R.layout.condition_container) {
+            return new ConditionContainerHolder(view);
+        }
+        if (viewType == R.layout.suggestion_container) {
+            return new SuggestionContainerHolder(view);
+        }
+        return new DashboardItemHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(DashboardItemHolder holder, int position) {
+        final int type = mDashboardData.getItemTypeByPosition(position);
+        switch (type) {
+            case R.layout.dashboard_tile:
+                final Tile tile = (Tile) mDashboardData.getItemEntityByPosition(position);
+                onBindTile((DashboardItemHolder) holder, tile);
+                holder.itemView.setTag(tile);
+                holder.itemView.setOnClickListener(mTileClickListener);
+                break;
+            case R.layout.suggestion_container:
+                onBindSuggestion((SuggestionContainerHolder) holder, position);
+                break;
+            case R.layout.condition_container:
+                onBindCondition((ConditionContainerHolder) holder, position);
+                break;
+            case R.layout.suggestion_condition_header:
+                onBindConditionHeader((ConditionHeaderHolder) holder,
+                        (ConditionHeaderData) mDashboardData.getItemEntityByPosition(position));
+                break;
+            case R.layout.suggestion_condition_footer:
+                holder.itemView.setOnClickListener(v -> {
+                    mMetricsFeatureProvider.action(mContext,
+                            MetricsEvent.ACTION_SETTINGS_CONDITION_EXPAND, false);
+                    DashboardDataV2 prevData = mDashboardData;
+                    mDashboardData = new DashboardDataV2.Builder(prevData).
+                        setConditionExpanded(false).build();
+                    notifyDashboardDataChanged(prevData);
+                    scrollToTopOfConditions();
+                });
+                break;
+        }
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return mDashboardData.getItemIdByPosition(position);
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return mDashboardData.getItemTypeByPosition(position);
+    }
+
+    @Override
+    public int getItemCount() {
+        return mDashboardData.size();
+    }
+
+    @Override
+    public void onAttachedToRecyclerView(RecyclerView recyclerView) {
+        super.onAttachedToRecyclerView(recyclerView);
+        // save the view so that we can scroll it when expanding/collapsing the suggestion and
+        // conditions.
+        mRecyclerView = recyclerView;
+    }
+
+    public Object getItem(long itemId) {
+        return mDashboardData.getItemEntityById(itemId);
+    }
+
+    public Suggestion getSuggestion(int position) {
+        return mSuggestionAdapter.getSuggestion(position);
+    }
+
+    @VisibleForTesting
+    void notifyDashboardDataChanged(DashboardDataV2 prevData) {
+        if (mFirstFrameDrawn && prevData != null) {
+            final DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(new DashboardDataV2
+                    .ItemsDataDiffCallback(prevData.getItemList(), mDashboardData.getItemList()));
+            diffResult.dispatchUpdatesTo(this);
+        } else {
+            mFirstFrameDrawn = true;
+            notifyDataSetChanged();
+        }
+    }
+
+    @VisibleForTesting
+    void onBindConditionHeader(final ConditionHeaderHolder holder, ConditionHeaderData data) {
+        holder.icon.setImageIcon(data.conditionIcons.get(0));
+        if (data.conditionCount == 1) {
+            holder.title.setText(data.title);
+            holder.summary.setText(null);
+            holder.icons.setVisibility(View.INVISIBLE);
+        } else {
+            holder.title.setText(null);
+            holder.summary.setText(
+                mContext.getString(R.string.condition_summary, data.conditionCount));
+            updateConditionIcons(data.conditionIcons, holder.icons);
+            holder.icons.setVisibility(View.VISIBLE);
+        }
+
+        holder.itemView.setOnClickListener(v -> {
+            mMetricsFeatureProvider.action(mContext,
+                MetricsEvent.ACTION_SETTINGS_CONDITION_EXPAND, true);
+            final DashboardDataV2 prevData = mDashboardData;
+            mDashboardData = new DashboardDataV2.Builder(prevData)
+                    .setConditionExpanded(true).build();
+            notifyDashboardDataChanged(prevData);
+            scrollToTopOfConditions();
+        });
+    }
+
+    @VisibleForTesting
+    void onBindCondition(final ConditionContainerHolder holder, int position) {
+        final ConditionAdapterV2 adapter = new ConditionAdapterV2(mContext,
+            (List<Condition>) mDashboardData.getItemEntityByPosition(position),
+            mDashboardData.isConditionExpanded());
+        adapter.addDismissHandling(holder.data);
+        holder.data.setAdapter(adapter);
+        holder.data.setLayoutManager(new LinearLayoutManager(mContext));
+    }
+
+    @VisibleForTesting
+    void onBindSuggestion(final SuggestionContainerHolder holder, int position) {
+        // If there is suggestions to show, it will be at position 0 as we don't show the suggestion
+        // header anymore.
+        final List<Suggestion> suggestions = mDashboardData.getSuggestions();
+        final int suggestionCount = suggestions.size();
+        if (suggestions != null && suggestionCount > 0) {
+            holder.summary.setText(""+suggestionCount);
+            mSuggestionAdapter.setSuggestions(suggestions);
+            holder.data.setAdapter(mSuggestionAdapter);
+        }
+        final LinearLayoutManager layoutManager = new LinearLayoutManager(mContext);
+        layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
+        holder.data.setLayoutManager(layoutManager);
+    }
+
+    private void onBindTile(DashboardItemHolder holder, Tile tile) {
+        holder.icon.setImageDrawable(mCache.getIcon(tile.icon));
+        holder.title.setText(tile.title);
+        if (!TextUtils.isEmpty(tile.summary)) {
+            holder.summary.setText(tile.summary);
+            holder.summary.setVisibility(View.VISIBLE);
+        } else {
+            holder.summary.setVisibility(View.GONE);
+        }
+    }
+
+    private void tintIcons(DashboardCategory category) {
+        if (!mDashboardFeatureProvider.shouldTintIcon()) {
+            return;
+        }
+        // TODO: Better place for tinting?
+        final TypedArray a = mContext.obtainStyledAttributes(new int[]{
+                android.R.attr.colorControlNormal});
+        final int tintColor = a.getColor(0, mContext.getColor(R.color.fallback_tintColor));
+        a.recycle();
+        if (category != null) {
+            for (Tile tile : category.getTiles()) {
+                if (tile.isIconTintable) {
+                    // If this drawable is tintable, tint it to match the color.
+                    tile.icon.setTint(tintColor);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        final DashboardCategory category = mDashboardData.getCategory();
+        if (category != null) {
+            outState.putParcelable(STATE_CATEGORY_LIST, category);
+        }
+        outState.putBoolean(STATE_CONDITION_EXPANDED, mDashboardData.isConditionExpanded());
+    }
+
+    private void updateConditionIcons(List<Icon> icons, ViewGroup parent) {
+        if (icons == null || icons.size() < 2) {
+            parent.setVisibility(View.INVISIBLE);
+            return;
+        }
+        final LayoutInflater inflater = LayoutInflater.from(parent.getContext());
+        parent.removeAllViews();
+        for (int i = 1, size = icons.size(); i < size; i++) {
+            ImageView icon = (ImageView) inflater.inflate(
+                    R.layout.condition_header_icon, parent, false);
+            icon.setImageIcon(icons.get(i));
+            parent.addView(icon);
+        }
+        parent.setVisibility(View.VISIBLE);
+    }
+
+    private void scrollToTopOfConditions() {
+        mRecyclerView.scrollToPosition(mDashboardData.hasSuggestion() ? 1 : 0);
+    }
+
+    public static class IconCache {
+        private final Context mContext;
+        private final ArrayMap<Icon, Drawable> mMap = new ArrayMap<>();
+
+        public IconCache(Context context) {
+            mContext = context;
+        }
+
+        public Drawable getIcon(Icon icon) {
+            if (icon == null) {
+                return null;
+            }
+            Drawable drawable = mMap.get(icon);
+            if (drawable == null) {
+                drawable = icon.loadDrawable(mContext);
+                mMap.put(icon, drawable);
+            }
+            return drawable;
+        }
+    }
+
+    public static class DashboardItemHolder extends RecyclerView.ViewHolder {
+        public final ImageView icon;
+        public final TextView title;
+        public final TextView summary;
+
+        public DashboardItemHolder(View itemView) {
+            super(itemView);
+            icon = itemView.findViewById(android.R.id.icon);
+            title = itemView.findViewById(android.R.id.title);
+            summary = itemView.findViewById(android.R.id.summary);
+        }
+    }
+
+    public static class ConditionHeaderHolder extends DashboardItemHolder {
+        public final LinearLayout icons;
+        public final ImageView expandIndicator;
+
+        public ConditionHeaderHolder(View itemView) {
+            super(itemView);
+            icons = itemView.findViewById(id.additional_icons);
+            expandIndicator = itemView.findViewById(id.expand_indicator);
+        }
+    }
+
+    public static class ConditionContainerHolder extends DashboardItemHolder {
+        public final RecyclerView data;
+
+        public ConditionContainerHolder(View itemView) {
+            super(itemView);
+            data = itemView.findViewById(id.data);
+        }
+    }
+
+    public static class SuggestionContainerHolder extends DashboardItemHolder {
+        public final RecyclerView data;
+
+        public SuggestionContainerHolder(View itemView) {
+            super(itemView);
+            data = itemView.findViewById(id.suggestion_list);
+        }
+    }
+
+}
diff --git a/src/com/android/settings/dashboard/DashboardDataV2.java b/src/com/android/settings/dashboard/DashboardDataV2.java
new file mode 100644
index 0000000..e25ee05
--- /dev/null
+++ b/src/com/android/settings/dashboard/DashboardDataV2.java
@@ -0,0 +1,446 @@
+/*
+ * 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.dashboard;
+
+import android.annotation.IntDef;
+import android.graphics.drawable.Icon;
+import android.service.settings.suggestions.Suggestion;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.util.DiffUtil;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.conditional.Condition;
+import com.android.settingslib.drawer.DashboardCategory;
+import com.android.settingslib.drawer.Tile;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Description about data list used in the DashboardAdapter. In the data list each item can be
+ * Condition, suggestion or category tile.
+ * <p>
+ * ItemsData has inner class Item, which represents the Item in data list.
+ */
+public class DashboardDataV2 {
+    public static final int POSITION_NOT_FOUND = -1;
+    public static final int MAX_SUGGESTION_COUNT = 4;
+
+    // stable id for different type of items.
+    @VisibleForTesting
+    static final int STABLE_ID_SUGGESTION_CONTAINER = 0;
+    static final int STABLE_ID_SUGGESTION_CONDITION_DIVIDER = 1;
+    @VisibleForTesting
+    static final int STABLE_ID_CONDITION_HEADER = 2;
+    @VisibleForTesting
+    static final int STABLE_ID_CONDITION_FOOTER = 3;
+    @VisibleForTesting
+    static final int STABLE_ID_CONDITION_CONTAINER = 4;
+
+    private final List<Item> mItems;
+    private final DashboardCategory mCategory;
+    private final List<Condition> mConditions;
+    private final List<Suggestion> mSuggestions;
+    private final boolean mConditionExpanded;
+
+    private DashboardDataV2(Builder builder) {
+        mCategory = builder.mCategory;
+        mConditions = builder.mConditions;
+        mSuggestions = builder.mSuggestions;
+        mConditionExpanded = builder.mConditionExpanded;
+        mItems = new ArrayList<>();
+
+        buildItemsData();
+    }
+
+    public int getItemIdByPosition(int position) {
+        return mItems.get(position).id;
+    }
+
+    public int getItemTypeByPosition(int position) {
+        return mItems.get(position).type;
+    }
+
+    public Object getItemEntityByPosition(int position) {
+        return mItems.get(position).entity;
+    }
+
+    public List<Item> getItemList() {
+        return mItems;
+    }
+
+    public int size() {
+        return mItems.size();
+    }
+
+    public Object getItemEntityById(long id) {
+        for (final Item item : mItems) {
+            if (item.id == id) {
+                return item.entity;
+            }
+        }
+        return null;
+    }
+
+    public DashboardCategory getCategory() {
+        return mCategory;
+    }
+
+    public List<Condition> getConditions() {
+        return mConditions;
+    }
+
+    public List<Suggestion> getSuggestions() {
+        return mSuggestions;
+    }
+
+    public boolean hasSuggestion() {
+        return sizeOf(mSuggestions) > 0;
+    }
+
+    public boolean isConditionExpanded() {
+        return mConditionExpanded;
+    }
+
+    /**
+     * Find the position of the object in mItems list, using the equals method to compare
+     *
+     * @param entity the object that need to be found in list
+     * @return position of the object, return POSITION_NOT_FOUND if object isn't in the list
+     */
+    public int getPositionByEntity(Object entity) {
+        if (entity == null) return POSITION_NOT_FOUND;
+
+        final int size = mItems.size();
+        for (int i = 0; i < size; i++) {
+            final Object item = mItems.get(i).entity;
+            if (entity.equals(item)) {
+                return i;
+            }
+        }
+
+        return POSITION_NOT_FOUND;
+    }
+
+    /**
+     * Find the position of the Tile object.
+     * <p>
+     * First, try to find the exact identical instance of the tile object, if not found,
+     * then try to find a tile has the same title.
+     *
+     * @param tile tile that need to be found
+     * @return position of the object, return INDEX_NOT_FOUND if object isn't in the list
+     */
+    public int getPositionByTile(Tile tile) {
+        final int size = mItems.size();
+        for (int i = 0; i < size; i++) {
+            final Object entity = mItems.get(i).entity;
+            if (entity == tile) {
+                return i;
+            } else if (entity instanceof Tile && tile.title.equals(((Tile) entity).title)) {
+                return i;
+            }
+        }
+
+        return POSITION_NOT_FOUND;
+    }
+
+    /**
+     * Add item into list when {@paramref add} is true.
+     *
+     * @param item     maybe {@link Condition}, {@link Tile}, {@link DashboardCategory} or null
+     * @param type     type of the item, and value is the layout id
+     * @param stableId The stable id for this item
+     * @param add      flag about whether to add item into list
+     */
+    private void addToItemList(Object item, int type, int stableId, boolean add) {
+        if (add) {
+            mItems.add(new Item(item, type, stableId));
+        }
+    }
+
+    /**
+     * Build the mItems list using mConditions, mSuggestions, mCategories data
+     * and mIsShowingAll, mConditionExpanded flag.
+     */
+    private void buildItemsData() {
+        final List<Condition> conditions = getConditionsToShow(mConditions);
+        final boolean hasConditions = sizeOf(conditions) > 0;
+
+        final List<Suggestion> suggestions = getSuggestionsToShow(mSuggestions);
+        final boolean hasSuggestions = sizeOf(suggestions) > 0;
+
+        /* Suggestion container. This is the card view that contains the list of suggestions.
+         * This will be added whenever the suggestion list is not empty */
+        addToItemList(suggestions, R.layout.suggestion_container,
+            STABLE_ID_SUGGESTION_CONTAINER, hasSuggestions);
+
+        /* Divider between suggestion and conditions if both are present. */
+        addToItemList(suggestions, R.layout.horizontal_divider,
+            STABLE_ID_SUGGESTION_CONDITION_DIVIDER, hasSuggestions && hasConditions);
+
+        /* Condition header. This will be present when there is condition and it is collapsed */
+        addToItemList(new ConditionHeaderData(conditions),
+            R.layout.suggestion_condition_header,
+            STABLE_ID_CONDITION_HEADER, hasConditions && !mConditionExpanded);
+
+        /* Condition container. This is the card view that contains the list of conditions.
+         * This will be added whenever the condition list is not empty and expanded */
+        addToItemList(conditions, R.layout.condition_container,
+            STABLE_ID_CONDITION_CONTAINER, hasConditions && mConditionExpanded);
+
+        /* Condition footer. This will be present when there is condition and it is expanded */
+        addToItemList(null /* item */, R.layout.suggestion_condition_footer,
+            STABLE_ID_CONDITION_FOOTER, hasConditions && mConditionExpanded);
+
+        if (mCategory != null) {
+            final List<Tile> tiles = mCategory.getTiles();
+            for (int i = 0; i < tiles.size(); i++) {
+                final Tile tile = tiles.get(i);
+                addToItemList(tile, R.layout.dashboard_tile, Objects.hash(tile.title),
+                    true /* add */);
+            }
+        }
+    }
+
+    private static int sizeOf(List<?> list) {
+        return list == null ? 0 : list.size();
+    }
+
+    private List<Condition> getConditionsToShow(List<Condition> conditions) {
+        if (conditions == null) {
+            return null;
+        }
+        List<Condition> result = new ArrayList<>();
+        final int size = conditions == null ? 0 : conditions.size();
+        for (int i = 0; i < size; i++) {
+            final Condition condition = conditions.get(i);
+            if (condition.shouldShow()) {
+                result.add(condition);
+            }
+        }
+        return result;
+    }
+
+    private List<Suggestion> getSuggestionsToShow(List<Suggestion> suggestions) {
+        if (suggestions == null) {
+            return null;
+        }
+        if (suggestions.size() <= MAX_SUGGESTION_COUNT) {
+            return suggestions;
+        }
+        return suggestions.subList(0, MAX_SUGGESTION_COUNT);
+    }
+
+    /**
+     * Builder used to build the ItemsData
+     */
+    public static class Builder {
+        private DashboardCategory mCategory;
+        private List<Condition> mConditions;
+        private List<Suggestion> mSuggestions;
+        private boolean mConditionExpanded;
+
+        public Builder() {
+        }
+
+        public Builder(DashboardDataV2 dashboardData) {
+            mCategory = dashboardData.mCategory;
+            mConditions = dashboardData.mConditions;
+            mSuggestions = dashboardData.mSuggestions;
+            mConditionExpanded = dashboardData.mConditionExpanded;
+        }
+
+        public Builder setCategory(DashboardCategory category) {
+            this.mCategory = category;
+            return this;
+        }
+
+        public Builder setConditions(List<Condition> conditions) {
+            this.mConditions = conditions;
+            return this;
+        }
+
+        public Builder setSuggestions(List<Suggestion> suggestions) {
+            this.mSuggestions = suggestions;
+            return this;
+        }
+
+        public Builder setConditionExpanded(boolean expanded) {
+            this.mConditionExpanded = expanded;
+            return this;
+        }
+
+        public DashboardDataV2 build() {
+            return new DashboardDataV2(this);
+        }
+    }
+
+    /**
+     * A DiffCallback to calculate the difference between old and new Item
+     * List in DashboardDataV2
+     */
+    public static class ItemsDataDiffCallback extends DiffUtil.Callback {
+        final private List<Item> mOldItems;
+        final private List<Item> mNewItems;
+
+        public ItemsDataDiffCallback(List<Item> oldItems, List<Item> newItems) {
+            mOldItems = oldItems;
+            mNewItems = newItems;
+        }
+
+        @Override
+        public int getOldListSize() {
+            return mOldItems.size();
+        }
+
+        @Override
+        public int getNewListSize() {
+            return mNewItems.size();
+        }
+
+        @Override
+        public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
+            return mOldItems.get(oldItemPosition).id == mNewItems.get(newItemPosition).id;
+        }
+
+        @Override
+        public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
+            return mOldItems.get(oldItemPosition).equals(mNewItems.get(newItemPosition));
+        }
+
+    }
+
+    /**
+     * An item contains the data needed in the DashboardDataV2.
+     */
+    static class Item {
+        // valid types in field type
+        private static final int TYPE_DASHBOARD_TILE = R.layout.dashboard_tile;
+        private static final int TYPE_SUGGESTION_CONTAINER =
+            R.layout.suggestion_container;
+        private static final int TYPE_CONDITION_CONTAINER =
+            R.layout.condition_container;
+        private static final int TYPE_CONDITION_HEADER =
+            R.layout.suggestion_condition_header;
+        private static final int TYPE_CONDITION_FOOTER =
+            R.layout.suggestion_condition_footer;
+        private static final int TYPE_SUGGESTION_CONDITION_DIVIDER = R.layout.horizontal_divider;
+
+        @IntDef({TYPE_DASHBOARD_TILE, TYPE_SUGGESTION_CONTAINER, TYPE_CONDITION_CONTAINER,
+            TYPE_CONDITION_HEADER, TYPE_CONDITION_FOOTER, TYPE_SUGGESTION_CONDITION_DIVIDER})
+        @Retention(RetentionPolicy.SOURCE)
+        public @interface ItemTypes {
+        }
+
+        /**
+         * The main data object in item, usually is a {@link Tile}, {@link Condition}
+         * object. This object can also be null when the
+         * item is an divider line. Please refer to {@link #buildItemsData()} for
+         * detail usage of the Item.
+         */
+        public final Object entity;
+
+        /**
+         * The type of item, value inside is the layout id(e.g. R.layout.dashboard_tile)
+         */
+        @ItemTypes
+        public final int type;
+
+        /**
+         * Id of this item, used in the {@link ItemsDataDiffCallback} to identify the same item.
+         */
+        public final int id;
+
+        public Item(Object entity, @ItemTypes int type, int id) {
+            this.entity = entity;
+            this.type = type;
+            this.id = id;
+        }
+
+        /**
+         * Override it to make comparision in the {@link ItemsDataDiffCallback}
+         *
+         * @param obj object to compared with
+         * @return true if the same object or has equal value.
+         */
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+
+            if (!(obj instanceof Item)) {
+                return false;
+            }
+
+            final Item targetItem = (Item) obj;
+            if (type != targetItem.type || id != targetItem.id) {
+                return false;
+            }
+
+            switch (type) {
+                case TYPE_DASHBOARD_TILE:
+                    final Tile localTile = (Tile) entity;
+                    final Tile targetTile = (Tile) targetItem.entity;
+
+                    // Only check title and summary for dashboard tile
+                    return TextUtils.equals(localTile.title, targetTile.title)
+                        && TextUtils.equals(localTile.summary, targetTile.summary);
+                case TYPE_SUGGESTION_CONTAINER:
+                case TYPE_CONDITION_CONTAINER:
+                    // If entity is suggestion and contains remote view, force refresh
+                    final List entities = (List) entity;
+                    if (!entities.isEmpty()) {
+                        Object firstEntity = entities.get(0);
+                        if (firstEntity instanceof Tile
+                            && ((Tile) firstEntity).remoteViews != null) {
+                            return false;
+                        }
+                    }
+                    // Otherwise Fall through to default
+                default:
+                    return entity == null ? targetItem.entity == null
+                        : entity.equals(targetItem.entity);
+            }
+        }
+    }
+
+    /**
+     * This class contains the data needed to build the suggestion/condition header. The data can
+     * also be used to check the diff in DiffUtil.Callback
+     */
+    public static class ConditionHeaderData {
+        public final List<Icon> conditionIcons;
+        public final CharSequence title;
+        public final int conditionCount;
+
+        public ConditionHeaderData(List<Condition> conditions) {
+            conditionCount = sizeOf(conditions);
+            title = conditionCount > 0 ? conditions.get(0).getTitle() : null;
+            conditionIcons = new ArrayList<>();
+            for (int i = 0; conditions != null && i < conditions.size(); i++) {
+                final Condition condition = conditions.get(i);
+                conditionIcons.add(condition.getIcon());
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProvider.java b/src/com/android/settings/dashboard/DashboardFeatureProvider.java
index 3ca146b..c493e672 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProvider.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProvider.java
@@ -88,4 +88,9 @@
      */
     void openTileIntent(Activity activity, Tile tile);
 
+    /**
+     * Whether or not we should use the v2 of suggestions UI.
+     */
+    boolean useSuggestionUiV2();
+
 }
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
index 048f6ed..a06fee9 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -33,12 +33,14 @@
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
 import android.util.ArrayMap;
+import android.util.FeatureFlagUtils;
 import android.util.Log;
 import android.util.Pair;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.drawer.CategoryManager;
@@ -213,6 +215,11 @@
         launchIntentOrSelectProfile(activity, tile, intent, MetricsEvent.DASHBOARD_SUMMARY);
     }
 
+    @Override
+    public boolean useSuggestionUiV2() {
+        return FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SUGGESTION_UI_V2);
+    }
+
     private void bindSummary(Preference preference, Tile tile) {
         if (tile.summary != null) {
             preference.setSummary(tile.summary);
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 61c202e..15b407b 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -65,6 +65,7 @@
 
     private FocusRecyclerView mDashboard;
     private DashboardAdapter mAdapter;
+    private DashboardAdapterV2 mAdapterV2;
     private SummaryLoader mSummaryLoader;
     private ConditionManager mConditionManager;
     private LinearLayoutManager mLayoutManager;
@@ -175,8 +176,10 @@
         super.onSaveInstanceState(outState);
         if (mLayoutManager == null) return;
         outState.putInt(EXTRA_SCROLL_POSITION, mLayoutManager.findFirstVisibleItemPosition());
-        if (mAdapter != null) {
-            mAdapter.onSaveInstanceState(outState);
+        if (!mDashboardFeatureProvider.useSuggestionUiV2()) {
+            if (mAdapter != null) {
+                mAdapter.onSaveInstanceState(outState);
+            }
         }
     }
 
@@ -194,11 +197,18 @@
         mDashboard.setLayoutManager(mLayoutManager);
         mDashboard.setHasFixedSize(true);
         mDashboard.setListener(this);
-        mAdapter = new DashboardAdapter(getContext(), bundle, mConditionManager.getConditions(),
-                mSuggestionControllerMixin, this /* SuggestionDismissController.Callback */);
-        mDashboard.setAdapter(mAdapter);
         mDashboard.setItemAnimator(new DashboardItemAnimator());
-        mSummaryLoader.setSummaryConsumer(mAdapter);
+        if (mDashboardFeatureProvider.useSuggestionUiV2()) {
+            mAdapterV2 = new DashboardAdapterV2(getContext(), bundle,
+                mConditionManager.getConditions(), mSuggestionControllerMixin, getLifecycle());
+            mDashboard.setAdapter(mAdapterV2);
+            mSummaryLoader.setSummaryConsumer(mAdapterV2);
+        } else {
+            mAdapter = new DashboardAdapter(getContext(), bundle, mConditionManager.getConditions(),
+                mSuggestionControllerMixin, this /* SuggestionDismissController.Callback */);
+            mDashboard.setAdapter(mAdapter);
+            mSummaryLoader.setSummaryConsumer(mAdapter);
+        }
         ActionBarShadowController.attachToRecyclerView(
                 getActivity().findViewById(R.id.search_bar_container), getLifecycle(), mDashboard);
         rebuildUI();
@@ -237,7 +247,11 @@
         if (mOnConditionsChangedCalled) {
             final boolean scrollToTop =
                     mLayoutManager.findFirstCompletelyVisibleItemPosition() <= 1;
-            mAdapter.setConditions(mConditionManager.getConditions());
+            if (mDashboardFeatureProvider.useSuggestionUiV2()) {
+                mAdapterV2.setConditions(mConditionManager.getConditions());
+            } else {
+                mAdapter.setConditions(mConditionManager.getConditions());
+            }
             if (scrollToTop) {
                 mDashboard.scrollToPosition(0);
             }
@@ -248,7 +262,11 @@
 
     @Override
     public Suggestion getSuggestionAt(int position) {
-        return mAdapter.getSuggestion(position);
+        if (mDashboardFeatureProvider.useSuggestionUiV2()) {
+            return mAdapterV2.getSuggestion(position);
+        } else {
+            return mAdapter.getSuggestion(position);
+        }
     }
 
     @Override
@@ -259,11 +277,20 @@
     @Override
     public void onSuggestionReady(List<Suggestion> suggestions) {
         mStagingSuggestions = suggestions;
-        mAdapter.setSuggestions(suggestions);
-        if (mStagingCategory != null) {
-            Log.d(TAG, "Category has loaded, setting category from suggestionReady");
-            mHandler.removeCallbacksAndMessages(null);
-            mAdapter.setCategory(mStagingCategory);
+        if (mDashboardFeatureProvider.useSuggestionUiV2()) {
+            mAdapterV2.setSuggestions(suggestions);
+            if (mStagingCategory != null) {
+                Log.d(TAG, "Category has loaded, setting category from suggestionReady");
+                mHandler.removeCallbacksAndMessages(null);
+                mAdapterV2.setCategory(mStagingCategory);
+            }
+        } else {
+            mAdapter.setSuggestions(suggestions);
+            if (mStagingCategory != null) {
+                Log.d(TAG, "Category has loaded, setting category from suggestionReady");
+                mHandler.removeCallbacksAndMessages(null);
+                mAdapter.setCategory(mStagingCategory);
+            }
         }
     }
 
@@ -276,14 +303,26 @@
         if (mSuggestionControllerMixin.isSuggestionLoaded()) {
             Log.d(TAG, "Suggestion has loaded, setting suggestion/category");
             ThreadUtils.postOnMainThread(() -> {
-                if (mStagingSuggestions != null) {
-                    mAdapter.setSuggestions(mStagingSuggestions);
+                if (mDashboardFeatureProvider.useSuggestionUiV2()) {
+                    if (mStagingSuggestions != null) {
+                        mAdapterV2.setSuggestions(mStagingSuggestions);
+                    }
+                    mAdapterV2.setCategory(mStagingCategory);
+                } else {
+                    if (mStagingSuggestions != null) {
+                        mAdapter.setSuggestions(mStagingSuggestions);
+                    }
+                    mAdapter.setCategory(mStagingCategory);
                 }
-                mAdapter.setCategory(mStagingCategory);
             });
         } else {
             Log.d(TAG, "Suggestion NOT loaded, delaying setCategory by " + MAX_WAIT_MILLIS + "ms");
-            mHandler.postDelayed(() -> mAdapter.setCategory(mStagingCategory), MAX_WAIT_MILLIS);
+            if (mDashboardFeatureProvider.useSuggestionUiV2()) {
+                mHandler.postDelayed(()
+                    -> mAdapterV2.setCategory(mStagingCategory), MAX_WAIT_MILLIS);
+            } else {
+                mHandler.postDelayed(() -> mAdapter.setCategory(mStagingCategory), MAX_WAIT_MILLIS);
+            }
         }
     }
 }
diff --git a/src/com/android/settings/dashboard/conditional/ConditionAdapterV2.java b/src/com/android/settings/dashboard/conditional/ConditionAdapterV2.java
new file mode 100644
index 0000000..3f3e5c9
--- /dev/null
+++ b/src/com/android/settings/dashboard/conditional/ConditionAdapterV2.java
@@ -0,0 +1,186 @@
+/*
+ * 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.dashboard.conditional;
+
+import android.content.Context;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.helper.ItemTouchHelper;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.dashboard.DashboardAdapterV2.DashboardItemHolder;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.WirelessUtils;
+
+import java.util.List;
+import java.util.Objects;
+
+public class ConditionAdapterV2 extends RecyclerView.Adapter<DashboardItemHolder> {
+    public static final String TAG = "ConditionAdapter";
+
+    private final Context mContext;
+    private final MetricsFeatureProvider mMetricsFeatureProvider;
+    private List<Condition> mConditions;
+    private boolean mExpanded;
+
+    private View.OnClickListener mConditionClickListener = new View.OnClickListener() {
+
+        @Override
+        public void onClick(View v) {
+            //TODO: get rid of setTag/getTag
+            Condition condition = (Condition) v.getTag();
+            mMetricsFeatureProvider.action(mContext,
+                MetricsEvent.ACTION_SETTINGS_CONDITION_CLICK,
+                condition.getMetricsConstant());
+            condition.onPrimaryClick();
+        }
+    };
+
+    @VisibleForTesting
+    ItemTouchHelper.SimpleCallback mSwipeCallback = new ItemTouchHelper.SimpleCallback(0,
+            ItemTouchHelper.START | ItemTouchHelper.END) {
+        @Override
+        public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder,
+                RecyclerView.ViewHolder target) {
+            return true;
+        }
+
+        @Override
+        public int getSwipeDirs(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+            return viewHolder.getItemViewType() == R.layout.condition_tile
+                    ? super.getSwipeDirs(recyclerView, viewHolder) : 0;
+        }
+
+        @Override
+        public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
+            Object item = getItem(viewHolder.getItemId());
+            // item can become null when running monkey
+            if (item != null) {
+                ((Condition) item).silence();
+            }
+        }
+    };
+
+    public ConditionAdapterV2(Context context, List<Condition> conditions, boolean expanded) {
+        mContext = context;
+        mConditions = conditions;
+        mExpanded = expanded;
+        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
+
+        setHasStableIds(true);
+    }
+
+    public Object getItem(long itemId) {
+        for (Condition condition : mConditions) {
+            if (Objects.hash(condition.getTitle()) == itemId) {
+                return condition;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public DashboardItemHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        return new DashboardItemHolder(LayoutInflater.from(parent.getContext()).inflate(
+                viewType, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(DashboardItemHolder holder, int position) {
+        bindViews(mConditions.get(position), holder,
+            position == mConditions.size() - 1, mConditionClickListener);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return Objects.hash(mConditions.get(position).getTitle());
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return R.layout.condition_tile;
+    }
+
+    @Override
+    public int getItemCount() {
+        if (mExpanded) {
+            return mConditions.size();
+        }
+        return 0;
+    }
+
+    public void addDismissHandling(final RecyclerView recyclerView) {
+        final ItemTouchHelper itemTouchHelper = new ItemTouchHelper(mSwipeCallback);
+        itemTouchHelper.attachToRecyclerView(recyclerView);
+    }
+
+    private void bindViews(final Condition condition,
+            DashboardItemHolder view, boolean isLastItem,
+            View.OnClickListener onClickListener) {
+        if (condition instanceof AirplaneModeCondition) {
+            Log.d(TAG, "Airplane mode condition has been bound with "
+                    + "isActive=" + condition.isActive() + ". Airplane mode is currently " +
+                    WirelessUtils.isAirplaneModeOn(condition.mManager.getContext()));
+        }
+        View card = view.itemView.findViewById(R.id.content);
+        card.setTag(condition);
+        card.setOnClickListener(onClickListener);
+        view.icon.setImageIcon(condition.getIcon());
+        view.title.setText(condition.getTitle());
+
+        CharSequence[] actions = condition.getActions();
+        final boolean hasButtons = actions.length > 0;
+        setViewVisibility(view.itemView, R.id.buttonBar, hasButtons);
+
+        view.summary.setText(condition.getSummary());
+        for (int i = 0; i < 2; i++) {
+            Button button = (Button) view.itemView.findViewById(i == 0
+                    ? R.id.first_action : R.id.second_action);
+            if (actions.length > i) {
+                button.setVisibility(View.VISIBLE);
+                button.setText(actions[i]);
+                final int index = i;
+                button.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        Context context = v.getContext();
+                        FeatureFactory.getFactory(context).getMetricsFeatureProvider()
+                                .action(context, MetricsEvent.ACTION_SETTINGS_CONDITION_BUTTON,
+                                        condition.getMetricsConstant());
+                        condition.onActionClick(index);
+                    }
+                });
+            } else {
+                button.setVisibility(View.GONE);
+            }
+        }
+        setViewVisibility(view.itemView, R.id.divider, !isLastItem);
+    }
+
+    private void setViewVisibility(View containerView, int viewId, boolean visible) {
+        View view = containerView.findViewById(viewId);
+        if (view != null) {
+            view.setVisibility(visible ? View.VISIBLE : View.GONE);
+        }
+    }
+}
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionAdapterV2.java b/src/com/android/settings/dashboard/suggestions/SuggestionAdapterV2.java
new file mode 100644
index 0000000..89c731f
--- /dev/null
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionAdapterV2.java
@@ -0,0 +1,231 @@
+/*
+ * 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.dashboard.suggestions;
+
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.service.settings.suggestions.Suggestion;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.dashboard.DashboardAdapterV2.DashboardItemHolder;
+import com.android.settings.dashboard.DashboardAdapterV2.IconCache;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+public class SuggestionAdapterV2 extends RecyclerView.Adapter<DashboardItemHolder> implements
+        LifecycleObserver, OnSaveInstanceState {
+    public static final String TAG = "SuggestionAdapterV2";
+
+    private static final String STATE_SUGGESTIONS_SHOWN_LOGGED = "suggestions_shown_logged";
+    private static final String STATE_SUGGESTION_LIST = "suggestion_list";
+
+    private final Context mContext;
+    private final MetricsFeatureProvider mMetricsFeatureProvider;
+    private final IconCache mCache;
+    private final ArrayList<String> mSuggestionsShownLogged;
+    private final SuggestionControllerMixin mSuggestionControllerMixin;
+    private final Callback mCallback;
+    private final int mMultipleCardsMarginEnd;
+    private final int mWidthSingleCard;
+    private final int mWidthTwoCards;
+    private final int mWidthMultipleCards;
+
+    private List<Suggestion> mSuggestions;
+
+    public interface Callback {
+        /**
+         * Called when the close button of the suggestion card is clicked.
+         */
+        void onSuggestionClosed(Suggestion suggestion);
+    }
+
+    public SuggestionAdapterV2(Context context, SuggestionControllerMixin suggestionControllerMixin,
+            Bundle savedInstanceState, Callback callback, Lifecycle lifecycle) {
+        mContext = context;
+        mSuggestionControllerMixin = suggestionControllerMixin;
+        mCache = new IconCache(context);
+        final FeatureFactory factory = FeatureFactory.getFactory(context);
+        mMetricsFeatureProvider = factory.getMetricsFeatureProvider();
+        mCallback = callback;
+        if (savedInstanceState != null) {
+            mSuggestions = savedInstanceState.getParcelableArrayList(STATE_SUGGESTION_LIST);
+            mSuggestionsShownLogged = savedInstanceState.getStringArrayList(
+                STATE_SUGGESTIONS_SHOWN_LOGGED);
+        } else {
+            mSuggestionsShownLogged = new ArrayList<>();
+        }
+
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+
+        final Resources res = mContext.getResources();
+        mMultipleCardsMarginEnd = res.getDimensionPixelOffset(R.dimen.suggestion_card_margin_end);
+        mWidthSingleCard = res.getDimensionPixelOffset(R.dimen.suggestion_card_width_one_card);
+        mWidthTwoCards = res.getDimensionPixelOffset(R.dimen.suggestion_card_width_two_cards);
+        mWidthMultipleCards =
+            res.getDimensionPixelOffset(R.dimen.suggestion_card_width_multiple_cards);
+
+        setHasStableIds(true);
+    }
+
+    @Override
+    public DashboardItemHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        return new DashboardItemHolder(LayoutInflater.from(parent.getContext()).inflate(
+                viewType, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(DashboardItemHolder holder, int position) {
+        final Suggestion suggestion = mSuggestions.get(position);
+        final String id = suggestion.getId();
+        final int suggestionCount = mSuggestions.size();
+        if (!mSuggestionsShownLogged.contains(id)) {
+            mMetricsFeatureProvider.action(
+                    mContext, MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION, id);
+            mSuggestionsShownLogged.add(id);
+        }
+        setCardWidthAndMargin(holder, suggestionCount);
+        holder.icon.setImageDrawable(mCache.getIcon(suggestion.getIcon()));
+        holder.title.setText(suggestion.getTitle());
+        holder.title.setSingleLine(suggestionCount == 1);
+
+        if (suggestionCount == 1) {
+            final CharSequence summary = suggestion.getSummary();
+            if (!TextUtils.isEmpty(summary)) {
+                holder.summary.setText(summary);
+                holder.summary.setVisibility(View.VISIBLE);
+            } else {
+                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);
+        }
+
+        final ImageView closeButton = holder.itemView.findViewById(R.id.close_button);
+        if (closeButton != null) {
+            if (mCallback != null) {
+                closeButton.setOnClickListener(v -> {
+                    mCallback.onSuggestionClosed(suggestion);
+                });
+            } else {
+                closeButton.setOnClickListener(null);
+            }
+        }
+
+        View clickHandler = holder.itemView;
+        // If a view with @android:id/primary is defined, use that as the click handler
+        // instead.
+        final View primaryAction = holder.itemView.findViewById(android.R.id.primary);
+        if (primaryAction != null) {
+            clickHandler = primaryAction;
+        }
+        clickHandler.setOnClickListener(v -> {
+            mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_SETTINGS_SUGGESTION, id);
+            try {
+                suggestion.getPendingIntent().send();
+                mSuggestionControllerMixin.launchSuggestion(suggestion);
+            } catch (PendingIntent.CanceledException e) {
+                Log.w(TAG, "Failed to start suggestion " + suggestion.getTitle());
+            }
+        });
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return Objects.hash(mSuggestions.get(position).getId());
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        final Suggestion suggestion = getSuggestion(position);
+        if ((suggestion.getFlags() & Suggestion.FLAG_HAS_BUTTON) != 0) {
+            return R.layout.suggestion_tile_with_button_v2;
+        } else {
+            return R.layout.suggestion_tile_v2;
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return mSuggestions.size();
+    }
+
+    public Suggestion getSuggestion(int position) {
+        final long itemId = getItemId(position);
+        if (mSuggestions == null) {
+            return null;
+        }
+        for (Suggestion suggestion : mSuggestions) {
+            if (Objects.hash(suggestion.getId()) == itemId) {
+                return suggestion;
+            }
+        }
+        return null;
+    }
+
+    public void removeSuggestion(Suggestion suggestion) {
+        final int position = mSuggestions.indexOf(suggestion);
+        mSuggestions.remove(suggestion);
+        notifyItemRemoved(position);
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        if (mSuggestions != null) {
+            outState.putParcelableArrayList(STATE_SUGGESTION_LIST,
+                new ArrayList<>(mSuggestions));
+        }
+        outState.putStringArrayList(STATE_SUGGESTIONS_SHOWN_LOGGED, mSuggestionsShownLogged);
+    }
+
+    public void setSuggestions(List<Suggestion> suggestions) {
+        mSuggestions = suggestions;
+    }
+
+    public List<Suggestion> getSuggestions() {
+        return mSuggestions;
+    }
+
+    private void setCardWidthAndMargin(DashboardItemHolder holder, int suggestionCount) {
+        final LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
+            suggestionCount == 1
+                ? mWidthSingleCard : suggestionCount == 2 ? mWidthTwoCards : mWidthMultipleCards,
+            LinearLayout.LayoutParams.WRAP_CONTENT);
+        params.setMarginEnd(suggestionCount == 1 ? 0 : mMultipleCardsMarginEnd);
+        holder.itemView.setLayoutParams(params);
+    }
+}
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java b/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
index de0c129..db2d0bb 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
@@ -24,6 +24,10 @@
 import com.android.settings.R;
 import com.android.settings.overlay.FeatureFactory;
 
+/**
+ * Deprecated as a close button is provided to dismiss the suggestion.
+ */
+@Deprecated
 public class SuggestionDismissController extends ItemTouchHelper.SimpleCallback {
 
     public interface Callback {
diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java
index b4d5f50..e626c3a 100644
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -20,8 +20,6 @@
 import android.content.Intent;
 import android.net.NetworkPolicyManager;
 import android.net.NetworkTemplate;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.UserManager;
 import android.provider.SearchIndexableResource;
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index a404bc0..5cd80c9 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -398,7 +398,6 @@
         controllers.add(new CameraLaserSensorPreferenceController(context));
         controllers.add(new WifiDisplayCertificationPreferenceController(context));
         controllers.add(new WifiVerboseLoggingPreferenceController(context));
-        controllers.add(new WifiAggressiveHandoverPreferenceController(context));
         controllers.add(new WifiRoamScansPreferenceController(context));
         controllers.add(new MobileDataAlwaysOnPreferenceController(context));
         controllers.add(new TetheringHardwareAccelPreferenceController(context));
@@ -424,6 +423,7 @@
         controllers.add(new ShowLayoutBoundsPreferenceController(context));
         controllers.add(new RtlLayoutPreferenceController(context));
         controllers.add(new WindowAnimationScalePreferenceController(context));
+        controllers.add(new EmulateDisplayCutoutPreferenceController(context));
         controllers.add(new TransitionAnimationScalePreferenceController(context));
         controllers.add(new AnimatorDurationScalePreferenceController(context));
         controllers.add(new SecondaryDisplayPreferenceController(context));
@@ -441,6 +441,7 @@
         controllers.add(new ProfileGpuRenderingPreferenceController(context));
         controllers.add(new KeepActivitiesPreferenceController(context));
         controllers.add(new BackgroundProcessLimitPreferenceController(context));
+        controllers.add(new ShowFirstCrashDialogPreferenceController(context));
         controllers.add(new AppsNotRespondingPreferenceController(context));
         controllers.add(new NotificationChannelWarningsPreferenceController(context));
         controllers.add(new AllowAppsOnExternalPreferenceController(context));
diff --git a/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java b/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java
new file mode 100644
index 0000000..1035a1b
--- /dev/null
+++ b/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java
@@ -0,0 +1,122 @@
+/*
+ * 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.content.om.IOverlayManager;
+import android.content.om.OverlayInfo;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.UserHandle;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.support.v7.preference.TwoStatePreference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class EmulateDisplayCutoutPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String EMULATION_OVERLAY = "com.android.internal.display.cutout.emulation";
+    private static final String KEY = "display_cutout_emulation";
+
+    private final IOverlayManager mOverlayManager;
+    private final boolean mAvailable;
+
+    private TwoStatePreference mPreference;
+
+    @VisibleForTesting
+    EmulateDisplayCutoutPreferenceController(Context context, IOverlayManager overlayManager) {
+        super(context);
+        mOverlayManager = overlayManager;
+        mAvailable = overlayManager != null && getEmulationOverlayInfo() != null;
+    }
+
+    public EmulateDisplayCutoutPreferenceController(Context context) {
+        this(context, IOverlayManager.Stub.asInterface(
+                ServiceManager.getService(Context.OVERLAY_SERVICE)));
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mAvailable;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        setPreference((TwoStatePreference) screen.findPreference(getPreferenceKey()));
+    }
+
+    @VisibleForTesting
+    void setPreference(TwoStatePreference preference) {
+        mPreference = preference;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        return writeEnabled((boolean) newValue);
+    }
+
+    private boolean writeEnabled(boolean newValue) {
+        OverlayInfo current = getEmulationOverlayInfo();
+        if (current == null || current.isEnabled() == newValue) {
+            return false;
+        }
+        try {
+            return mOverlayManager.setEnabled(EMULATION_OVERLAY, newValue, UserHandle.USER_SYSTEM);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        OverlayInfo overlayInfo = getEmulationOverlayInfo();
+        mPreference.setChecked(overlayInfo != null && overlayInfo.isEnabled());
+    }
+
+    private OverlayInfo getEmulationOverlayInfo() {
+        OverlayInfo overlayInfo = null;
+        try {
+            overlayInfo = mOverlayManager.getOverlayInfo(EMULATION_OVERLAY, UserHandle.USER_SYSTEM);
+        } catch (RemoteException e) {
+            throw e.rethrowFromSystemServer();
+        }
+        return overlayInfo;
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        writeEnabled(false);
+        mPreference.setChecked(false);
+        mPreference.setEnabled(false);
+    }
+}
diff --git a/src/com/android/settings/development/WifiAggressiveHandoverPreferenceController.java b/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java
similarity index 61%
rename from src/com/android/settings/development/WifiAggressiveHandoverPreferenceController.java
rename to src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java
index aa607ce..e1f9b32 100644
--- a/src/com/android/settings/development/WifiAggressiveHandoverPreferenceController.java
+++ b/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 The Android Open Source Project
+ * Copyright (C) 2018 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 package com.android.settings.development;
 
 import android.content.Context;
-import android.net.wifi.WifiManager;
+import android.provider.Settings;
 import android.support.annotation.VisibleForTesting;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
@@ -26,29 +26,34 @@
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-public class WifiAggressiveHandoverPreferenceController extends
+public class ShowFirstCrashDialogPreferenceController extends
         DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
         PreferenceControllerMixin {
 
-    private static final String WIFI_AGGRESSIVE_HANDOVER_KEY = "wifi_aggressive_handover";
+    private static final String SHOW_FIRST_CRASH_DIALOG_KEY = "show_first_crash_dialog";
 
     @VisibleForTesting
     static final int SETTING_VALUE_ON = 1;
     @VisibleForTesting
     static final int SETTING_VALUE_OFF = 0;
 
-    private final WifiManager mWifiManager;
     private SwitchPreference mPreference;
 
-    public WifiAggressiveHandoverPreferenceController(Context context) {
+    public ShowFirstCrashDialogPreferenceController(Context context) {
         super(context);
-
-        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
     }
 
     @Override
     public String getPreferenceKey() {
-        return WIFI_AGGRESSIVE_HANDOVER_KEY;
+        return SHOW_FIRST_CRASH_DIALOG_KEY;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        // If the global setting is on, hide this preference since the global overrides
+        // any user preference.
+        return Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.SHOW_FIRST_CRASH_DIALOG, SETTING_VALUE_OFF) == SETTING_VALUE_OFF;
     }
 
     @Override
@@ -60,15 +65,18 @@
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-        boolean isEnabled = (Boolean) newValue;
-        mWifiManager.enableAggressiveHandover(isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        final boolean isEnabled = (Boolean) newValue;
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.SHOW_FIRST_CRASH_DIALOG_DEV_OPTION,
+                isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
         return true;
     }
 
     @Override
     public void updateState(Preference preference) {
-        boolean enabled = mWifiManager.getAggressiveHandover() > 0;
-        mPreference.setChecked(enabled);
+        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
@@ -78,8 +86,9 @@
 
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
-        mWifiManager.enableAggressiveHandover(SETTING_VALUE_OFF);
-        mPreference.setChecked(false);
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.SHOW_FIRST_CRASH_DIALOG_DEV_OPTION, SETTING_VALUE_OFF);
         mPreference.setEnabled(false);
+        mPreference.setChecked(false);
     }
 }
diff --git a/src/com/android/settings/development/qstile/DevelopmentTiles.java b/src/com/android/settings/development/qstile/DevelopmentTiles.java
index fea6588..38f9565 100644
--- a/src/com/android/settings/development/qstile/DevelopmentTiles.java
+++ b/src/com/android/settings/development/qstile/DevelopmentTiles.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.development.qstile;
 
+import android.content.Context;
 import android.os.IBinder;
 import android.os.Parcel;
 import android.os.RemoteException;
@@ -30,6 +31,7 @@
 import android.view.ThreadedRenderer;
 import android.view.View;
 import android.view.WindowManagerGlobal;
+import android.widget.Toast;
 
 import com.android.internal.app.LocalePicker;
 import com.android.settings.wrapper.IWindowManagerWrapper;
@@ -145,12 +147,17 @@
     public static class WindowTrace extends DevelopmentTiles {
         @VisibleForTesting
         IWindowManagerWrapper mWindowManager;
+        @VisibleForTesting
+        Toast mToast;
 
         @Override
         public void onCreate() {
             super.onCreate();
             mWindowManager = new IWindowManagerWrapper(WindowManagerGlobal
                     .getWindowManagerService());
+            Context context = getApplicationContext();
+            CharSequence text = "Trace written to /data/misc/wmtrace/wm_trace.pb";
+            mToast = Toast.makeText(context, text, Toast.LENGTH_LONG);
         }
 
         @Override
@@ -171,6 +178,7 @@
                     mWindowManager.startWindowTrace();
                 } else {
                     mWindowManager.stopWindowTrace();
+                    mToast.show();
                 }
             } catch (RemoteException e) {
                 Log.e(TAG, "Could not set window trace status." + e.toString());
@@ -188,11 +196,16 @@
         static final int SURFACE_FLINGER_LAYER_TRACE_STATUS_CODE = 1026;
         @VisibleForTesting
         IBinder mSurfaceFlinger;
+        @VisibleForTesting
+        Toast mToast;
 
         @Override
         public void onCreate() {
             super.onCreate();
             mSurfaceFlinger = ServiceManager.getService("SurfaceFlinger");
+            Context context = getApplicationContext();
+            CharSequence text = "Trace written to /data/misc/wmtrace/layers_trace.pb";
+            mToast = Toast.makeText(context, text, Toast.LENGTH_LONG);
         }
 
         @Override
@@ -230,6 +243,9 @@
                     data.writeInt(isEnabled ? 1 : 0);
                     mSurfaceFlinger.transact(SURFACE_FLINGER_LAYER_TRACE_CONTROL_CODE,
                             data, null, 0 /* flags */);
+                    if (!isEnabled){
+                        mToast.show();
+                    }
                 }
             } catch (RemoteException e) {
                 Log.e(TAG, "Could not set layer tracing." + e.toString());
diff --git a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
index 802d774..93f75bf 100644
--- a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
@@ -23,6 +23,8 @@
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.text.BidiFormatter;
+import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
 
 import com.android.settings.R;
@@ -120,7 +122,7 @@
         final String phoneNumber = DeviceInfoUtils.getFormattedPhoneNumber(mContext,
                 subscriptionInfo);
         return TextUtils.isEmpty(phoneNumber) ? mContext.getString(R.string.device_info_default)
-                : phoneNumber;
+                : BidiFormatter.getInstance().unicodeWrap(phoneNumber, TextDirectionHeuristics.LTR);
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java
index 0f88b4a..efcf03d 100644
--- a/src/com/android/settings/deviceinfo/StorageSettings.java
+++ b/src/com/android/settings/deviceinfo/StorageSettings.java
@@ -160,8 +160,11 @@
         mInternalCategory.addPreference(mInternalSummary);
 
         int privateCount = 0;
-        long privateUsedBytes = 0;
-        long privateTotalBytes = 0;
+
+        final StorageManagerVolumeProvider smvp = new StorageManagerVolumeProvider(mStorageManager);
+        final PrivateStorageInfo info = PrivateStorageInfo.getPrivateStorageInfo(smvp);
+        final long privateTotalBytes = info.totalBytes;
+        final long privateUsedBytes = info.totalBytes - info.freeBytes;
 
         final List<VolumeInfo> volumes = mStorageManager.getVolumes();
         Collections.sort(volumes, VolumeInfo.getDescriptionComparator());
@@ -173,11 +176,6 @@
                 final int color = COLOR_PRIVATE[privateCount++ % COLOR_PRIVATE.length];
                 mInternalCategory.addPreference(
                         new StorageVolumePreference(context, vol, color, volumeTotalBytes));
-                if (vol.isMountedReadable()) {
-                    final File path = vol.getPath();
-                    privateUsedBytes += (volumeTotalBytes - path.getFreeSpace());
-                    privateTotalBytes += volumeTotalBytes;
-                }
             } else if (vol.getType() == VolumeInfo.TYPE_PUBLIC) {
                 mExternalCategory.addPreference(
                         new StorageVolumePreference(context, vol, COLOR_PUBLIC, 0));
diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
index 91bdfbf..023b2a1 100644
--- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.deviceinfo;
 
+import android.app.usage.StorageStatsManager;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.Color;
@@ -25,6 +26,7 @@
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceViewHolder;
 import android.text.format.Formatter;
+import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ImageView;
@@ -34,6 +36,7 @@
 import com.android.settings.deviceinfo.StorageSettings.UnmountTask;
 import com.android.settingslib.Utils;
 
+import java.io.IOException;
 import java.io.File;
 
 /**
@@ -41,6 +44,8 @@
  * quick actions like unmounting.
  */
 public class StorageVolumePreference extends Preference {
+    private static final String TAG = StorageVolumePreference.class.getSimpleName();
+
     private final StorageManager mStorageManager;
     private final VolumeInfo mVolume;
 
@@ -70,11 +75,28 @@
         if (volume.isMountedReadable()) {
             // TODO: move statfs() to background thread
             final File path = volume.getPath();
-            if (totalBytes <= 0) {
-                totalBytes = path.getTotalSpace();
+
+            long freeBytes = 0;
+            long usedBytes = 0;
+            if (volume.getType() == VolumeInfo.TYPE_PRIVATE) {
+                final StorageStatsManager stats =
+                        context.getSystemService(StorageStatsManager.class);
+                try {
+                    totalBytes = stats.getTotalBytes(volume.getFsUuid());
+                    freeBytes = stats.getFreeBytes(volume.getFsUuid());
+                    usedBytes = totalBytes - freeBytes;
+                } catch (IOException e) {
+                    Log.w(TAG, e);
+                }
+            } else {
+                // StorageStatsManager can only query private volumes.
+                // Default to previous storage calculation for public volumes.
+                if (totalBytes <= 0) {
+                    totalBytes = path.getTotalSpace();
+                }
+                freeBytes = path.getFreeSpace();
+                usedBytes = totalBytes - freeBytes;
             }
-            final long freeBytes = path.getFreeSpace();
-            final long usedBytes = totalBytes - freeBytes;
 
             final String used = Formatter.formatFileSize(context, usedBytes);
             final String total = Formatter.formatFileSize(context, totalBytes);
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
index 35b8bd1..91440f7 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -39,6 +39,8 @@
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.text.BidiFormatter;
+import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -195,7 +197,8 @@
 
     private void updatePhoneNumber() {
         // If formattedNumber is null or empty, it'll display as "Unknown".
-        mDialog.setText(PHONE_NUMBER_VALUE_ID, getPhoneNumber());
+        mDialog.setText(PHONE_NUMBER_VALUE_ID, BidiFormatter.getInstance().unicodeWrap(
+                getPhoneNumber(), TextDirectionHeuristics.LTR));
     }
 
     private void updateDataState(int state) {
diff --git a/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java b/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java
index 6f35641..7cfe7a9 100644
--- a/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java
+++ b/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java
@@ -45,7 +45,7 @@
 
     @Override
     public boolean isAvailable() {
-        return true;
+        return mContext.getResources().getBoolean(R.bool.config_show_manage_device_admin);
     }
 
     @Override
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java
index fc6aa57..ced3461 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java
@@ -22,7 +22,7 @@
 import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.fuelgauge.BatteryInfo;
 import com.android.settings.fuelgauge.BatteryUtils;
-import com.android.settings.fuelgauge.batterytip.detectors.BatteryTipDetector;
+import com.android.settings.fuelgauge.batterytip.detectors.EarlyWarningDetector;
 import com.android.settings.fuelgauge.batterytip.detectors.HighUsageDetector;
 import com.android.settings.fuelgauge.batterytip.detectors.LowBatteryDetector;
 import com.android.settings.fuelgauge.batterytip.detectors.SmartBatteryDetector;
@@ -46,9 +46,8 @@
     private static final boolean USE_FAKE_DATA = false;
 
     private BatteryStatsHelper mBatteryStatsHelper;
-    private BatteryUtils mBatteryUtils;
     @VisibleForTesting
-    int mVisibleTips;
+    BatteryUtils mBatteryUtils;
 
     public BatteryTipLoader(Context context, BatteryStatsHelper batteryStatsHelper) {
         super(context);
@@ -64,15 +63,13 @@
         final List<BatteryTip> tips = new ArrayList<>();
         final BatteryTipPolicy policy = new BatteryTipPolicy(getContext());
         final BatteryInfo batteryInfo = mBatteryUtils.getBatteryInfo(mBatteryStatsHelper, TAG);
-        mVisibleTips = 0;
+        final Context context = getContext();
 
-        addBatteryTipFromDetector(tips, new LowBatteryDetector(policy, batteryInfo));
-        addBatteryTipFromDetector(tips,
-                new HighUsageDetector(getContext(), policy, mBatteryStatsHelper));
-        addBatteryTipFromDetector(tips,
-                new SmartBatteryDetector(policy, getContext().getContentResolver()));
-        // Add summary detector at last since it need other detectors to update the mVisibleTips
-        addBatteryTipFromDetector(tips, new SummaryDetector(policy, mVisibleTips));
+        tips.add(new LowBatteryDetector(policy, batteryInfo).detect());
+        tips.add(new HighUsageDetector(context, policy, mBatteryStatsHelper).detect());
+        tips.add(new SmartBatteryDetector(policy, context.getContentResolver()).detect());
+        tips.add(new EarlyWarningDetector(policy, context).detect());
+        tips.add(new SummaryDetector(policy).detect());
 
         Collections.sort(tips);
         return tips;
@@ -90,12 +87,4 @@
         return tips;
     }
 
-    @VisibleForTesting
-    void addBatteryTipFromDetector(final List<BatteryTip> tips,
-            final BatteryTipDetector detector) {
-        final BatteryTip batteryTip = detector.detect();
-        mVisibleTips += batteryTip.isVisible() ? 1 : 0;
-        tips.add(batteryTip);
-    }
-
 }
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java
index ac5072d..6af859b 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java
@@ -144,9 +144,9 @@
         highUsageEnabled = mParser.getBoolean(KEY_HIGH_USAGE_ENABLED, true);
         highUsageAppCount = mParser.getInt(KEY_HIGH_USAGE_APP_COUNT, 3);
         appRestrictionEnabled = mParser.getBoolean(KEY_APP_RESTRICTION_ENABLED, true);
-        reducedBatteryEnabled = mParser.getBoolean(KEY_REDUCED_BATTERY_ENABLED, true);
+        reducedBatteryEnabled = mParser.getBoolean(KEY_REDUCED_BATTERY_ENABLED, false);
         reducedBatteryPercent = mParser.getInt(KEY_REDUCED_BATTERY_PERCENT, 50);
-        lowBatteryEnabled = mParser.getBoolean(KEY_LOW_BATTERY_ENABLED, true);
+        lowBatteryEnabled = mParser.getBoolean(KEY_LOW_BATTERY_ENABLED, false);
         lowBatteryHour = mParser.getInt(KEY_LOW_BATTERY_HOUR, 16);
     }
 
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
index 9f5209f..9ab4c51 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
@@ -98,6 +98,7 @@
                 final Preference preference = batteryTip.buildPreference(mPrefContext);
                 mBatteryTipMap.put(preference.getKey(), batteryTip);
                 mPreferenceGroup.addPreference(preference);
+                break;
             }
         }
     }
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java
index d10fa37..5781afd 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java
@@ -19,6 +19,7 @@
 import android.app.Fragment;
 
 import com.android.settings.SettingsActivity;
+import com.android.settings.fuelgauge.batterytip.actions.BatterySaverAction;
 import com.android.settings.fuelgauge.batterytip.actions.BatteryTipAction;
 import com.android.settings.fuelgauge.batterytip.actions.SmartBatteryAction;
 import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
@@ -40,6 +41,8 @@
         switch (batteryTip.getType()) {
             case BatteryTip.TipType.SMART_BATTERY_MANAGER:
                 return new SmartBatteryAction(settingsActivity, fragment);
+            case BatteryTip.TipType.BATTERY_SAVER:
+                return new BatterySaverAction(settingsActivity.getApplicationContext());
             default:
                 return null;
         }
diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/BatterySaverAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/BatterySaverAction.java
new file mode 100644
index 0000000..310d3f8
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batterytip/actions/BatterySaverAction.java
@@ -0,0 +1,37 @@
+/*
+ * 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.fuelgauge.batterytip.actions;
+
+import android.content.Context;
+import android.os.PowerManager;
+
+public class BatterySaverAction extends BatteryTipAction {
+    private PowerManager mPowerManager;
+
+    public BatterySaverAction(Context context) {
+        super(context);
+        mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+    }
+
+    /**
+     * Handle the action when user clicks positive button
+     */
+    @Override
+    public void handlePositiveAction() {
+        mPowerManager.setPowerSaveMode(true);
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetector.java
new file mode 100644
index 0000000..cb23e94
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetector.java
@@ -0,0 +1,64 @@
+/*
+ * 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.fuelgauge.batterytip.detectors;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.BatteryManager;
+import android.os.PowerManager;
+
+import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
+import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy;
+import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
+import com.android.settings.fuelgauge.batterytip.tips.EarlyWarningTip;
+import com.android.settings.overlay.FeatureFactory;
+
+/**
+ * Detector whether to early warning tip.
+ */
+public class EarlyWarningDetector implements BatteryTipDetector {
+    private BatteryTipPolicy mPolicy;
+    private PowerManager mPowerManager;
+    private Context mContext;
+    private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
+
+    public EarlyWarningDetector(BatteryTipPolicy policy, Context context) {
+        mPolicy = policy;
+        mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+        mContext = context;
+        mPowerUsageFeatureProvider = FeatureFactory.getFactory(
+                context).getPowerUsageFeatureProvider(context);
+    }
+
+    @Override
+    public BatteryTip detect() {
+        final Intent batteryBroadcast = mContext.registerReceiver(null,
+                new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+        final boolean discharging =
+                batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) == 0;
+        final boolean powerSaveModeOn = mPowerManager.isPowerSaveMode();
+        final boolean earlyWarning = mPowerUsageFeatureProvider.getEarlyWarningSignal(mContext,
+                EarlyWarningDetector.class.getName());
+
+        final int state =
+                mPolicy.batterySaverTipEnabled && !powerSaveModeOn && discharging && earlyWarning
+                        ? BatteryTip.StateType.NEW
+                        : BatteryTip.StateType.INVISIBLE;
+        return new EarlyWarningTip(state, powerSaveModeOn);
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetector.java
index 8c1783b..a45dc09 100644
--- a/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetector.java
+++ b/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetector.java
@@ -26,17 +26,15 @@
  */
 public class SummaryDetector implements BatteryTipDetector {
     private BatteryTipPolicy mPolicy;
-    private int mVisibleTips;
 
-    public SummaryDetector(BatteryTipPolicy policy, int visibleTips) {
+    public SummaryDetector(BatteryTipPolicy policy) {
         mPolicy = policy;
-        mVisibleTips = visibleTips;
     }
 
     @Override
     public BatteryTip detect() {
         // Show it if there is no other tips shown
-        final int state = mPolicy.summaryEnabled && mVisibleTips == 0
+        final int state = mPolicy.summaryEnabled
                 ? BatteryTip.StateType.NEW
                 : BatteryTip.StateType.INVISIBLE;
         return new SummaryTip(state);
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
index 292849d..09ebc4b 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
@@ -52,13 +52,13 @@
             TipType.REDUCED_BATTERY,
             TipType.LOW_BATTERY})
     public @interface TipType {
-        int SUMMARY = 0;
-        int BATTERY_SAVER = 1;
+        int SMART_BATTERY_MANAGER = 0;
+        int APP_RESTRICTION = 1;
         int HIGH_DEVICE_USAGE = 2;
-        int SMART_BATTERY_MANAGER = 3;
-        int APP_RESTRICTION = 4;
-        int REDUCED_BATTERY = 5;
-        int LOW_BATTERY = 6;
+        int BATTERY_SAVER = 3;
+        int REDUCED_BATTERY = 4;
+        int LOW_BATTERY = 5;
+        int SUMMARY = 6;
     }
 
     private static final String KEY_PREFIX = "key_battery_tip";
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTip.java
new file mode 100644
index 0000000..f8d8fa1
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTip.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.fuelgauge.batterytip.tips;
+
+import android.content.Context;
+import android.os.Parcel;
+
+import com.android.settings.R;
+
+/**
+ * Tip to show early warning if battery couldn't make to usual charging time
+ */
+public class EarlyWarningTip extends BatteryTip {
+    private boolean mPowerSaveModeOn;
+
+    public EarlyWarningTip(@StateType int state, boolean powerSaveModeOn) {
+        super(TipType.BATTERY_SAVER, state, false /* showDialog */);
+        mPowerSaveModeOn = powerSaveModeOn;
+    }
+
+    public EarlyWarningTip(Parcel in) {
+        super(in);
+        mPowerSaveModeOn = in.readBoolean();
+    }
+
+    @Override
+    public CharSequence getTitle(Context context) {
+        return context.getString(
+                mState == StateType.HANDLED
+                        ? R.string.battery_tip_early_heads_up_done_title
+                        : R.string.battery_tip_early_heads_up_title);
+    }
+
+    @Override
+    public CharSequence getSummary(Context context) {
+        return context.getString(
+                mState == StateType.HANDLED
+                        ? R.string.battery_tip_early_heads_up_done_summary
+                        : R.string.battery_tip_early_heads_up_summary);
+    }
+
+    @Override
+    public int getIconId() {
+        return mState == StateType.HANDLED
+                ? R.drawable.ic_perm_device_information_green_24dp
+                : R.drawable.ic_battery_alert_24dp;
+    }
+
+    @Override
+    public void updateState(BatteryTip tip) {
+        final EarlyWarningTip earlyHeadsUpTip = (EarlyWarningTip) tip;
+        if (mPowerSaveModeOn != earlyHeadsUpTip.mPowerSaveModeOn) {
+            mPowerSaveModeOn = earlyHeadsUpTip.mPowerSaveModeOn;
+            mState = earlyHeadsUpTip.mPowerSaveModeOn ? StateType.HANDLED : StateType.NEW;
+        } else if (mState != StateType.HANDLED) {
+            mState = earlyHeadsUpTip.getState();
+        }
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        super.writeToParcel(dest, flags);
+        dest.writeBoolean(mPowerSaveModeOn);
+    }
+
+    public boolean isPowerSaveModeOn() {
+        return mPowerSaveModeOn;
+    }
+
+    public static final Creator CREATOR = new Creator() {
+        public BatteryTip createFromParcel(Parcel in) {
+            return new EarlyWarningTip(in);
+        }
+
+        public BatteryTip[] newArray(int size) {
+            return new EarlyWarningTip[size];
+        }
+    };
+}
diff --git a/src/com/android/settings/location/LocationEnabler.java b/src/com/android/settings/location/LocationEnabler.java
index 5c5399c..4dcdac0 100644
--- a/src/com/android/settings/location/LocationEnabler.java
+++ b/src/com/android/settings/location/LocationEnabler.java
@@ -34,6 +34,7 @@
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import static com.android.settingslib.Utils.updateLocationMode;
+import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced;
 
 /**
  * A class that listens to location settings change and modifies location settings
@@ -140,8 +141,14 @@
     }
 
     RestrictedLockUtils.EnforcedAdmin getShareLocationEnforcedAdmin(int userId) {
-        return RestrictedLockUtils.checkIfRestrictionEnforced(
+        RestrictedLockUtils.EnforcedAdmin admin =  checkIfRestrictionEnforced(
                 mContext, UserManager.DISALLOW_SHARE_LOCATION, userId);
+
+        if (admin == null) {
+            admin = RestrictedLockUtils.checkIfRestrictionEnforced(
+                    mContext, UserManager.DISALLOW_CONFIG_LOCATION_MODE, userId);
+        }
+        return admin;
     }
 
     boolean hasShareLocationRestriction(int userId) {
diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java
index d86f7f7..17cf211 100644
--- a/src/com/android/settings/network/AirplaneModePreferenceController.java
+++ b/src/com/android/settings/network/AirplaneModePreferenceController.java
@@ -30,6 +30,7 @@
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.R;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -91,7 +92,8 @@
     }
 
     public static boolean isAvailable(Context context) {
-        return !context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK);
+        return context.getResources().getBoolean(R.bool.config_show_toggle_airplane)
+                && !context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK);
     }
 
     @Override
diff --git a/src/com/android/settings/nfc/NfcForegroundPreference.java b/src/com/android/settings/nfc/NfcForegroundPreference.java
index f2d98bf..89095a4 100644
--- a/src/com/android/settings/nfc/NfcForegroundPreference.java
+++ b/src/com/android/settings/nfc/NfcForegroundPreference.java
@@ -17,18 +17,27 @@
 
 import android.content.Context;
 import android.support.v7.preference.DropDownPreference;
+import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
 
 public class NfcForegroundPreference extends DropDownPreference implements
-        PaymentBackend.Callback {
+        PaymentBackend.Callback, Preference.OnPreferenceChangeListener {
 
     private final PaymentBackend mPaymentBackend;
     public NfcForegroundPreference(Context context, PaymentBackend backend) {
         super(context);
         mPaymentBackend = backend;
         mPaymentBackend.registerCallback(this);
+
+        setTitle(getContext().getString(R.string.nfc_payment_use_default));
+        setEntries(new CharSequence[] {
+                getContext().getString(R.string.nfc_payment_favor_open),
+                getContext().getString(R.string.nfc_payment_favor_default)
+        });
+        setEntryValues(new CharSequence[] { "1", "0" });
         refresh();
+        setOnPreferenceChangeListener(this);
     }
 
     @Override
@@ -37,27 +46,20 @@
     }
 
     void refresh() {
-        PaymentBackend.PaymentAppInfo defaultApp = mPaymentBackend.getDefaultApp();
         boolean foregroundMode = mPaymentBackend.isForegroundMode();
-        setPersistent(false);
-        setTitle(getContext().getString(R.string.nfc_payment_use_default));
-        CharSequence favorOpen;
-        CharSequence favorDefault;
-        setEntries(new CharSequence[] {
-                getContext().getString(R.string.nfc_payment_favor_open),
-                getContext().getString(R.string.nfc_payment_favor_default)
-        });
-        setEntryValues(new CharSequence[] { "1", "0" });
         if (foregroundMode) {
             setValue("1");
         } else {
             setValue("0");
         }
+        setSummary(getEntry());
     }
 
     @Override
-    protected boolean persistString(String value) {
-        mPaymentBackend.setForegroundMode(Integer.parseInt(value) != 0);
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        String newValueString = (String) newValue;
+        setSummary(getEntries()[findIndexOfValue(newValueString)]);
+        mPaymentBackend.setForegroundMode(Integer.parseInt(newValueString) != 0);
         return true;
     }
 }
diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java
index 4a27b11..132dea6 100644
--- a/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@ -44,7 +44,6 @@
 public class SoundSettings extends DashboardFragment {
     private static final String TAG = "SoundSettings";
 
-    private static final String KEY_CELL_BROADCAST_SETTINGS = "cell_broadcast_settings";
     private static final String SELECTED_PREFERENCE_KEY = "selected_preference";
     private static final int REQUEST_CODE = 200;
 
@@ -182,8 +181,6 @@
             Lifecycle lifecycle) {
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new ZenModePreferenceController(context));
-        controllers.add(new EmergencyBroadcastPreferenceController(
-                context, KEY_CELL_BROADCAST_SETTINGS));
         controllers.add(new VibrateWhenRingPreferenceController(context));
 
         // === Volumes ===
@@ -268,7 +265,6 @@
                     List<String> keys = super.getNonIndexableKeys(context);
                     // Duplicate results
                     keys.add((new ZenModePreferenceController(context)).getPreferenceKey());
-                    keys.add(KEY_CELL_BROADCAST_SETTINGS);
                     return keys;
                 }
             };
diff --git a/src/com/android/settings/notification/ZenAccessSettings.java b/src/com/android/settings/notification/ZenAccessSettings.java
index d92bc5a..ec378f3 100644
--- a/src/com/android/settings/notification/ZenAccessSettings.java
+++ b/src/com/android/settings/notification/ZenAccessSettings.java
@@ -137,6 +137,7 @@
             final String pkg = app.packageName;
             final CharSequence label = app.loadLabel(mPkgMan);
             final SwitchPreference pref = new AppSwitchPreference(getPrefContext());
+            pref.setKey(pkg);
             pref.setPersistent(false);
             pref.setIcon(app.loadIcon(mPkgMan));
             pref.setTitle(label);
diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
index 746a977..972fac8 100644
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -412,7 +412,7 @@
         private ChooseLockSettingsHelper mChooseLockSettingsHelper;
         private SaveAndFinishWorker mSaveAndFinishWorker;
         protected int mUserId;
-        private boolean mForFingerprint;
+        protected boolean mForFingerprint;
 
         private static final String KEY_UI_STAGE = "uiStage";
         private static final String KEY_PATTERN_CHOICE = "chosenPattern";
@@ -657,13 +657,7 @@
                 mFooterText.setText(stage.footerMessage);
             }
 
-            if (stage.leftMode == LeftButtonMode.Gone) {
-                mFooterLeftButton.setVisibility(View.GONE);
-            } else {
-                mFooterLeftButton.setVisibility(View.VISIBLE);
-                mFooterLeftButton.setText(stage.leftMode.text);
-                mFooterLeftButton.setEnabled(stage.leftMode.enabled);
-            }
+            updateFooterLeftButton(stage, mFooterLeftButton);
 
             setRightButtonText(stage.rightMode.text);
             setRightButtonEnabled(stage.rightMode.enabled);
@@ -713,6 +707,16 @@
             }
         }
 
+        protected void updateFooterLeftButton(Stage stage, TextView footerLeftButton) {
+            if (stage.leftMode == LeftButtonMode.Gone) {
+                footerLeftButton.setVisibility(View.GONE);
+            } else {
+                footerLeftButton.setVisibility(View.VISIBLE);
+                footerLeftButton.setText(stage.leftMode.text);
+                footerLeftButton.setEnabled(stage.leftMode.enabled);
+            }
+        }
+
         // clear the wrong pattern unless they have started a new one
         // already
         private void postClearPatternRunnable() {
diff --git a/src/com/android/settings/password/SetupChooseLockPattern.java b/src/com/android/settings/password/SetupChooseLockPattern.java
index b1c9fac..4ae5839 100644
--- a/src/com/android/settings/password/SetupChooseLockPattern.java
+++ b/src/com/android/settings/password/SetupChooseLockPattern.java
@@ -22,6 +22,7 @@
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
+import android.widget.TextView;
 
 import com.android.settings.R;
 import com.android.settings.SetupRedactionInterstitial;
@@ -72,6 +73,24 @@
         }
 
         @Override
+        protected void updateFooterLeftButton(Stage stage, TextView footerLeftButton) {
+            super.updateFooterLeftButton(stage, footerLeftButton);
+            // enable skip button only during setupwizard and not with fingerprint flow.
+            if (!mForFingerprint) {
+                footerLeftButton.setVisibility(View.VISIBLE);
+                footerLeftButton.setText(R.string.skip_label);
+            }
+        }
+
+        @Override
+        public void handleLeftButton() {
+            SetupSkipDialog dialog = SetupSkipDialog.newInstance(
+                    getActivity().getIntent()
+                            .getBooleanExtra(SetupSkipDialog.EXTRA_FRP_SUPPORTED, false));
+            dialog.show(getFragmentManager());
+        }
+
+        @Override
         protected Intent getRedactionInterstitialIntent(Context context) {
             // Setup wizard's redaction interstitial is deferred to optional step. Enable that
             // optional step if the lock screen was set up.
diff --git a/src/com/android/settings/search/AccessibilityServiceResultLoader.java b/src/com/android/settings/search/AccessibilityServiceResultLoader.java
deleted file mode 100644
index 327aef2..0000000
--- a/src/com/android/settings/search/AccessibilityServiceResultLoader.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.search;
-
-import static com.android.settings.search.InstalledAppResultLoader.getWordDifference;
-
-import android.accessibilityservice.AccessibilityServiceInfo;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-import android.graphics.drawable.Drawable;
-import android.os.UserHandle;
-import android.support.annotation.VisibleForTesting;
-import android.support.v4.content.ContextCompat;
-import android.util.IconDrawableFactory;
-import android.util.Log;
-import android.view.accessibility.AccessibilityManager;
-
-import com.android.settings.R;
-import com.android.settings.accessibility.AccessibilitySettings;
-import com.android.settings.dashboard.SiteMapManager;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.Callable;
-import java.util.concurrent.FutureTask;
-
-public class AccessibilityServiceResultLoader extends
-        FutureTask<List<? extends SearchResult>> {
-
-    private static final String TAG = "A11yResultFutureTask";
-
-    public AccessibilityServiceResultLoader(Context context, String query,
-            SiteMapManager manager) {
-        super(new AccessibilityServiceResultCallable(context, query, manager));
-    }
-
-    static class AccessibilityServiceResultCallable implements
-            Callable<List<? extends SearchResult>> {
-
-        private static final int NAME_NO_MATCH = -1;
-
-        private final Context mContext;
-        private List<String> mBreadcrumb;
-        private SiteMapManager mSiteMapManager;
-        @VisibleForTesting
-        final String mQuery;
-        private final AccessibilityManager mAccessibilityManager;
-        private final PackageManager mPackageManager;
-        private final int mUserId;
-
-        public AccessibilityServiceResultCallable(Context context, String query,
-                SiteMapManager mapManager) {
-            mUserId = UserHandle.myUserId();
-            mContext = context;
-            mSiteMapManager = mapManager;
-            mPackageManager = context.getPackageManager();
-            mAccessibilityManager =
-                    (AccessibilityManager) context.getSystemService(Context.ACCESSIBILITY_SERVICE);
-            mQuery = query;
-        }
-
-        @Override
-        public List<? extends SearchResult> call() throws Exception {
-            long startTime = System.currentTimeMillis();
-            final List<SearchResult> results = new ArrayList<>();
-            final List<AccessibilityServiceInfo> services = mAccessibilityManager
-                    .getInstalledAccessibilityServiceList();
-            final IconDrawableFactory iconFactory = IconDrawableFactory.newInstance(mContext);
-            final String screenTitle = mContext.getString(R.string.accessibility_settings);
-            for (AccessibilityServiceInfo service : services) {
-                if (service == null) {
-                    continue;
-                }
-                final ResolveInfo resolveInfo = service.getResolveInfo();
-                if (service.getResolveInfo() == null) {
-                    continue;
-                }
-                final ServiceInfo serviceInfo = resolveInfo.serviceInfo;
-                final CharSequence title = resolveInfo.loadLabel(mPackageManager);
-                final int wordDiff = getWordDifference(title.toString(), mQuery);
-                if (wordDiff == NAME_NO_MATCH) {
-                    continue;
-                }
-                final Drawable icon;
-                if (resolveInfo.getIconResource() == 0) {
-                    icon = ContextCompat.getDrawable(mContext, R.mipmap.ic_accessibility_generic);
-                } else {
-                    icon = iconFactory.getBadgedIcon(
-                            resolveInfo.serviceInfo,
-                            resolveInfo.serviceInfo.applicationInfo,
-                            mUserId);
-                }
-                final String componentName = new ComponentName(serviceInfo.packageName,
-                        serviceInfo.name).flattenToString();
-                final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(mContext,
-                        AccessibilitySettings.class.getName(), componentName, screenTitle);
-
-                results.add(new SearchResult.Builder()
-                        .setTitle(title)
-                        .addBreadcrumbs(getBreadCrumb())
-                        .setPayload(new ResultPayload(intent))
-                        .setRank(wordDiff)
-                        .setIcon(icon)
-                        .setStableId(Objects.hash(screenTitle, componentName))
-                        .build());
-            }
-            Collections.sort(results);
-            Log.i(TAG, "A11y search loading took:" + (System.currentTimeMillis() - startTime));
-            return results;
-        }
-
-        private List<String> getBreadCrumb() {
-            if (mBreadcrumb == null || mBreadcrumb.isEmpty()) {
-                mBreadcrumb = mSiteMapManager.buildBreadCrumb(
-                        mContext, AccessibilitySettings.class.getName(),
-                        mContext.getString(R.string.accessibility_settings));
-            }
-            return mBreadcrumb;
-        }
-    }
-}
diff --git a/src/com/android/settings/search/AppSearchResult.java b/src/com/android/settings/search/AppSearchResult.java
deleted file mode 100644
index b59e32e..0000000
--- a/src/com/android/settings/search/AppSearchResult.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.content.pm.ApplicationInfo;
-import android.os.UserHandle;
-
-public class AppSearchResult extends SearchResult {
-    /**
-     * Installed app's ApplicationInfo for delayed loading of icons
-     */
-    public final ApplicationInfo info;
-
-    public AppSearchResult(Builder builder) {
-        super(builder);
-        info = builder.mInfo;
-    }
-
-    public UserHandle getAppUserHandle() {
-        return new UserHandle(UserHandle.getUserId(info.uid));
-    }
-
-    public static class Builder extends SearchResult.Builder {
-        protected ApplicationInfo mInfo;
-
-        public SearchResult.Builder setAppInfo(ApplicationInfo info) {
-            mInfo = info;
-            return this;
-        }
-
-        public AppSearchResult build() {
-            return new AppSearchResult(this);
-        }
-    }
-}
diff --git a/src/com/android/settings/search/DatabaseResultLoader.java b/src/com/android/settings/search/DatabaseResultLoader.java
index 66548a4..3b5cc47 100644
--- a/src/com/android/settings/search/DatabaseResultLoader.java
+++ b/src/com/android/settings/search/DatabaseResultLoader.java
@@ -18,35 +18,11 @@
 package com.android.settings.search;
 
 import static com.android.settings.search.IndexDatabaseHelper.IndexColumns;
-import static com.android.settings.search.IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.support.annotation.VisibleForTesting;
-import android.util.Log;
-import android.util.Pair;
-
-import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.overlay.FeatureFactory;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
 /**
  * AsyncTask to retrieve Settings, first party app and any intent based results.
  */
-public class DatabaseResultLoader extends FutureTask<List<? extends SearchResult>> {
+public class DatabaseResultLoader {
 
     private static final String TAG = "DatabaseResultLoader";
 
@@ -66,18 +42,6 @@
             IndexColumns.PAYLOAD
     };
 
-    public static final String[] MATCH_COLUMNS_PRIMARY = {
-            IndexColumns.DATA_TITLE,
-            IndexColumns.DATA_TITLE_NORMALIZED,
-    };
-
-    public static final String[] MATCH_COLUMNS_SECONDARY = {
-            IndexColumns.DATA_SUMMARY_ON,
-            IndexColumns.DATA_SUMMARY_ON_NORMALIZED,
-            IndexColumns.DATA_SUMMARY_OFF,
-            IndexColumns.DATA_SUMMARY_OFF_NORMALIZED,
-    };
-
     /**
      * Base ranks defines the best possible rank based on what the query matches.
      * If the query matches the prefix of the first word in the title, the best rank it can be
@@ -89,256 +53,4 @@
      */
     public static final int[] BASE_RANKS = {1, 3, 7, 9};
 
-    public DatabaseResultLoader(Context context, String query, SiteMapManager manager) {
-        super(new StaticSearchResultCallable(context, query, manager));
-    }
-
-    static class StaticSearchResultCallable implements
-            Callable<List<? extends SearchResult>> {
-
-        public final String[] MATCH_COLUMNS_TERTIARY = {
-                IndexColumns.DATA_KEYWORDS,
-                IndexColumns.DATA_ENTRIES
-        };
-
-        @VisibleForTesting
-        final String mQueryText;
-        private final Context mContext;
-        private final CursorToSearchResultConverter mConverter;
-        private final SiteMapManager mSiteMapManager;
-        private final SearchFeatureProvider mFeatureProvider;
-
-        public StaticSearchResultCallable(Context context, String queryText,
-                SiteMapManager mapManager) {
-            mContext = context;
-            mSiteMapManager = mapManager;
-            mQueryText = queryText;
-            mConverter = new CursorToSearchResultConverter(context);
-            mFeatureProvider = FeatureFactory.getFactory(context).getSearchFeatureProvider();
-        }
-
-        @Override
-        public List<? extends SearchResult> call() {
-            if (mQueryText == null || mQueryText.isEmpty()) {
-                return new ArrayList<>();
-            }
-
-            // TODO (b/68656233) Consolidate timing metrics
-            long startTime = System.currentTimeMillis();
-            // Start a Future to get search result scores.
-            FutureTask<List<Pair<String, Float>>> rankerTask = mFeatureProvider.getRankerTask(
-                    mContext, mQueryText);
-
-            if (rankerTask != null) {
-                ExecutorService executorService = mFeatureProvider.getExecutorService();
-                executorService.execute(rankerTask);
-            }
-
-            final Set<SearchResult> resultSet = new HashSet<>();
-
-            resultSet.addAll(firstWordQuery(MATCH_COLUMNS_PRIMARY, BASE_RANKS[0]));
-            resultSet.addAll(secondaryWordQuery(MATCH_COLUMNS_PRIMARY, BASE_RANKS[1]));
-            resultSet.addAll(anyWordQuery(MATCH_COLUMNS_SECONDARY, BASE_RANKS[2]));
-            resultSet.addAll(anyWordQuery(MATCH_COLUMNS_TERTIARY, BASE_RANKS[3]));
-
-            // Try to retrieve the scores in time. Otherwise use static ranking.
-            if (rankerTask != null) {
-                try {
-                    final long timeoutMs = mFeatureProvider.smartSearchRankingTimeoutMs(mContext);
-                    List<Pair<String, Float>> searchRankScores = rankerTask.get(timeoutMs,
-                            TimeUnit.MILLISECONDS);
-                    return getDynamicRankedResults(resultSet, searchRankScores);
-                } catch (TimeoutException | InterruptedException | ExecutionException e) {
-                    Log.d(TAG, "Error waiting for result scores: " + e);
-                }
-            }
-
-            List<SearchResult> resultList = new ArrayList<>(resultSet);
-            Collections.sort(resultList);
-            Log.i(TAG, "Static search loading took:" + (System.currentTimeMillis() - startTime));
-            return resultList;
-        }
-
-        // TODO (b/33577327) Retrieve all search results with a single query.
-
-        /**
-         * Creates and executes the query which matches prefixes of the first word of the given
-         * columns.
-         *
-         * @param matchColumns The columns to match on
-         * @param baseRank     The highest rank achievable by these results
-         * @return A set of the matching results.
-         */
-        private Set<SearchResult> firstWordQuery(String[] matchColumns, int baseRank) {
-            final String whereClause = buildSingleWordWhereClause(matchColumns);
-            final String query = mQueryText + "%";
-            final String[] selection = buildSingleWordSelection(query, matchColumns.length);
-
-            return query(whereClause, selection, baseRank);
-        }
-
-        /**
-         * Creates and executes the query which matches prefixes of the non-first words of the
-         * given columns.
-         *
-         * @param matchColumns The columns to match on
-         * @param baseRank     The highest rank achievable by these results
-         * @return A set of the matching results.
-         */
-        private Set<SearchResult> secondaryWordQuery(String[] matchColumns, int baseRank) {
-            final String whereClause = buildSingleWordWhereClause(matchColumns);
-            final String query = "% " + mQueryText + "%";
-            final String[] selection = buildSingleWordSelection(query, matchColumns.length);
-
-            return query(whereClause, selection, baseRank);
-        }
-
-        /**
-         * Creates and executes the query which matches prefixes of the any word of the given
-         * columns.
-         *
-         * @param matchColumns The columns to match on
-         * @param baseRank     The highest rank achievable by these results
-         * @return A set of the matching results.
-         */
-        private Set<SearchResult> anyWordQuery(String[] matchColumns, int baseRank) {
-            final String whereClause = buildTwoWordWhereClause(matchColumns);
-            final String[] selection = buildAnyWordSelection(matchColumns.length * 2);
-
-            return query(whereClause, selection, baseRank);
-        }
-
-        /**
-         * Generic method used by all of the query methods above to execute a query.
-         *
-         * @param whereClause Where clause for the SQL query which uses bindings.
-         * @param selection   List of the transformed query to match each bind in the whereClause
-         * @param baseRank    The highest rank achievable by these results.
-         * @return A set of the matching results.
-         */
-        private Set<SearchResult> query(String whereClause, String[] selection, int baseRank) {
-            final SQLiteDatabase database =
-                    IndexDatabaseHelper.getInstance(mContext).getReadableDatabase();
-            try (Cursor resultCursor = database.query(TABLE_PREFS_INDEX, SELECT_COLUMNS,
-                    whereClause,
-                    selection, null, null, null)) {
-                return mConverter.convertCursor(mSiteMapManager, resultCursor, baseRank);
-            }
-        }
-
-        /**
-         * Builds the SQLite WHERE clause that matches all matchColumns for a single query.
-         *
-         * @param matchColumns List of columns that will be used for matching.
-         * @return The constructed WHERE clause.
-         */
-        private static String buildSingleWordWhereClause(String[] matchColumns) {
-            StringBuilder sb = new StringBuilder(" (");
-            final int count = matchColumns.length;
-            for (int n = 0; n < count; n++) {
-                sb.append(matchColumns[n]);
-                sb.append(" like ? ");
-                if (n < count - 1) {
-                    sb.append(" OR ");
-                }
-            }
-            sb.append(") AND enabled = 1");
-            return sb.toString();
-        }
-
-        /**
-         * Builds the SQLite WHERE clause that matches all matchColumns to two different queries.
-         *
-         * @param matchColumns List of columns that will be used for matching.
-         * @return The constructed WHERE clause.
-         */
-        private static String buildTwoWordWhereClause(String[] matchColumns) {
-            StringBuilder sb = new StringBuilder(" (");
-            final int count = matchColumns.length;
-            for (int n = 0; n < count; n++) {
-                sb.append(matchColumns[n]);
-                sb.append(" like ? OR ");
-                sb.append(matchColumns[n]);
-                sb.append(" like ?");
-                if (n < count - 1) {
-                    sb.append(" OR ");
-                }
-            }
-            sb.append(") AND enabled = 1");
-            return sb.toString();
-        }
-
-        /**
-         * Fills out the selection array to match the query as the prefix of a single word.
-         *
-         * @param size is the number of columns to be matched.
-         */
-        private String[] buildSingleWordSelection(String query, int size) {
-            String[] selection = new String[size];
-
-            for (int i = 0; i < size; i++) {
-                selection[i] = query;
-            }
-            return selection;
-        }
-
-        /**
-         * Fills out the selection array to match the query as the prefix of a word.
-         *
-         * @param size is twice the number of columns to be matched. The first match is for the
-         *             prefix
-         *             of the first word in the column. The second match is for any subsequent word
-         *             prefix match.
-         */
-        private String[] buildAnyWordSelection(int size) {
-            String[] selection = new String[size];
-            final String query = mQueryText + "%";
-            final String subStringQuery = "% " + mQueryText + "%";
-
-            for (int i = 0; i < (size - 1); i += 2) {
-                selection[i] = query;
-                selection[i + 1] = subStringQuery;
-            }
-            return selection;
-        }
-
-        private List<SearchResult> getDynamicRankedResults(Set<SearchResult> unsortedSet,
-                List<Pair<String, Float>> searchRankScores) {
-            TreeSet<SearchResult> dbResultsSortedByScores = new TreeSet<>(
-                    (o1, o2) -> {
-                        float score1 = getRankingScoreByStableId(searchRankScores, o1.stableId);
-                        float score2 = getRankingScoreByStableId(searchRankScores, o2.stableId);
-                        if (score1 > score2) {
-                            return -1;
-                        } else if (score1 == score2) {
-                            return 0;
-                        } else {
-                            return 1;
-                        }
-                    });
-            dbResultsSortedByScores.addAll(unsortedSet);
-
-            return new ArrayList<>(dbResultsSortedByScores);
-        }
-
-        /**
-         * Looks up ranking score for stableId
-         *
-         * @param stableId String of stableId
-         * @return the ranking score corresponding to the given stableId. If there is no score
-         * available for this stableId, -Float.MAX_VALUE is returned.
-         */
-        @VisibleForTesting
-        Float getRankingScoreByStableId(List<Pair<String, Float>> searchRankScores, int stableId) {
-            for (Pair<String, Float> rankingScore : searchRankScores) {
-                if (Integer.toString(stableId).compareTo(rankingScore.first) == 0) {
-                    return rankingScore.second;
-                }
-            }
-            // If stableId not found in the list, we assign the minimum score so it will appear at
-            // the end of the list.
-            Log.w(TAG, "stableId " + stableId + " was not in the ranking scores.");
-            return -Float.MAX_VALUE;
-        }
-    }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/search/InlineSwitchViewHolder.java b/src/com/android/settings/search/InlineSwitchViewHolder.java
deleted file mode 100644
index bb8320d..0000000
--- a/src/com/android/settings/search/InlineSwitchViewHolder.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.content.Context;
-import android.util.Pair;
-import android.view.View;
-import android.widget.Switch;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-
-/**
- * ViewHolder for Settings represented as SwitchPreferences.
- */
-public class InlineSwitchViewHolder extends SearchViewHolder {
-
-    public final Switch switchView;
-
-    private final Context mContext;
-
-    public InlineSwitchViewHolder(View view, Context context) {
-        super(view);
-        mContext = context;
-        switchView = view.findViewById(R.id.switchView);
-    }
-
-    @Override
-    public int getClickActionMetricName() {
-        return MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_INLINE_RESULT;
-    }
-
-    @Override
-    public void onBind(SearchFragment fragment, final SearchResult result) {
-        super.onBind(fragment, result);
-        if (mContext == null) {
-            return;
-        }
-        final InlineSwitchPayload payload = (InlineSwitchPayload) result.payload;
-        switchView.setChecked(payload.getValue(mContext) == InlineSwitchPayload.TRUE);
-        switchView.setOnCheckedChangeListener((buttonView, isChecked) -> {
-            final Pair<Integer, Object> value = Pair.create(
-                    MetricsEvent.FIELD_SETTINGS_SEARCH_INLINE_RESULT_VALUE, isChecked
-                            ? 1L : 0L);
-            fragment.onSearchResultClicked(this, result, value);
-            int newValue = isChecked ? InlineSwitchPayload.TRUE : InlineSwitchPayload.FALSE;
-            payload.setValue(mContext, newValue);
-        });
-    }
-}
diff --git a/src/com/android/settings/search/InputDeviceResultLoader.java b/src/com/android/settings/search/InputDeviceResultLoader.java
deleted file mode 100644
index 598281c..0000000
--- a/src/com/android/settings/search/InputDeviceResultLoader.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.search;
-
-import static android.content.Context.INPUT_METHOD_SERVICE;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ServiceInfo;
-import android.hardware.input.InputManager;
-import android.hardware.input.KeyboardLayout;
-import android.support.annotation.VisibleForTesting;
-import android.util.Log;
-import android.view.InputDevice;
-import android.view.inputmethod.InputMethodInfo;
-import android.view.inputmethod.InputMethodManager;
-import android.view.inputmethod.InputMethodSubtype;
-
-import com.android.settings.R;
-import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment;
-import com.android.settings.inputmethod.PhysicalKeyboardFragment;
-import com.android.settingslib.inputmethod.InputMethodAndSubtypeUtil;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.FutureTask;
-
-/**
- * Search result for input devices (physical/virtual keyboard, game controllers, etc)
- */
-
-public class InputDeviceResultLoader extends FutureTask<List<? extends SearchResult>> {
-
-    private static final String TAG = "InputResultFutureTask";
-
-    @VisibleForTesting
-    static final String PHYSICAL_KEYBOARD_FRAGMENT = PhysicalKeyboardFragment.class.getName();
-    @VisibleForTesting
-    static final String VIRTUAL_KEYBOARD_FRAGMENT =
-            AvailableVirtualKeyboardFragment.class.getName();
-
-    public InputDeviceResultLoader(Context context, String query, SiteMapManager manager) {
-        super(new InputDeviceResultCallable(context, query, manager));
-    }
-
-    static class InputDeviceResultCallable implements
-            Callable<List<? extends SearchResult>> {
-        private static final int NAME_NO_MATCH = -1;
-
-        private final Context mContext;
-        private final SiteMapManager mSiteMapManager;
-        private final InputManager mInputManager;
-        private final InputMethodManager mImm;
-        private final PackageManager mPackageManager;
-        @VisibleForTesting
-        final String mQuery;
-
-        private List<String> mPhysicalKeyboardBreadcrumb;
-        private List<String> mVirtualKeyboardBreadcrumb;
-
-        public InputDeviceResultCallable(Context context, String query, SiteMapManager mapManager) {
-            mContext = context;
-            mQuery = query;
-            mSiteMapManager = mapManager;
-            mInputManager = (InputManager) context.getSystemService(Context.INPUT_SERVICE);
-            mImm = (InputMethodManager) context.getSystemService(INPUT_METHOD_SERVICE);
-            mPackageManager = context.getPackageManager();
-        }
-
-        @Override
-        public List<? extends SearchResult> call() {
-            long startTime = System.currentTimeMillis();
-            final List<SearchResult> results = new ArrayList<>();
-            results.addAll(buildPhysicalKeyboardSearchResults());
-            results.addAll(buildVirtualKeyboardSearchResults());
-            Collections.sort(results);
-            Log.i(TAG, "Input search loading took:" + (System.currentTimeMillis() - startTime));
-            return results;
-        }
-
-        private Set<SearchResult> buildPhysicalKeyboardSearchResults() {
-            final Set<SearchResult> results = new HashSet<>();
-            final String screenTitle = mContext.getString(R.string.physical_keyboard_title);
-
-            for (final InputDevice device : getPhysicalFullKeyboards()) {
-                final String deviceName = device.getName();
-                final int wordDiff = InstalledAppResultLoader.getWordDifference(deviceName,
-                        mQuery);
-                if (wordDiff == NAME_NO_MATCH) {
-                    continue;
-                }
-                final String keyboardLayoutDescriptor = mInputManager
-                        .getCurrentKeyboardLayoutForInputDevice(device.getIdentifier());
-                final KeyboardLayout keyboardLayout = (keyboardLayoutDescriptor != null)
-                        ? mInputManager.getKeyboardLayout(keyboardLayoutDescriptor) : null;
-                final String summary = (keyboardLayout != null)
-                        ? keyboardLayout.toString()
-                        : mContext.getString(R.string.keyboard_layout_default_label);
-
-                final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(mContext,
-                        PHYSICAL_KEYBOARD_FRAGMENT, deviceName, screenTitle);
-                results.add(new SearchResult.Builder()
-                        .setTitle(deviceName)
-                        .setPayload(new ResultPayload(intent))
-                        .setStableId(Objects.hash(PHYSICAL_KEYBOARD_FRAGMENT, deviceName))
-                        .setSummary(summary)
-                        .setRank(wordDiff)
-                        .addBreadcrumbs(getPhysicalKeyboardBreadCrumb())
-                        .build());
-            }
-            return results;
-        }
-
-        private Set<SearchResult> buildVirtualKeyboardSearchResults() {
-            final Set<SearchResult> results = new HashSet<>();
-            final String screenTitle = mContext.getString(R.string.add_virtual_keyboard);
-            final List<InputMethodInfo> inputMethods = mImm.getInputMethodList();
-            for (InputMethodInfo info : inputMethods) {
-                final String title = info.loadLabel(mPackageManager).toString();
-                final String summary = InputMethodAndSubtypeUtil
-                        .getSubtypeLocaleNameListAsSentence(getAllSubtypesOf(info), mContext, info);
-                int wordDiff = InstalledAppResultLoader.getWordDifference(title, mQuery);
-                if (wordDiff == NAME_NO_MATCH) {
-                    wordDiff = InstalledAppResultLoader.getWordDifference(summary, mQuery);
-                }
-                if (wordDiff == NAME_NO_MATCH) {
-                    continue;
-                }
-                final ServiceInfo serviceInfo = info.getServiceInfo();
-                final String key = new ComponentName(serviceInfo.packageName, serviceInfo.name)
-                        .flattenToString();
-                final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(mContext,
-                        VIRTUAL_KEYBOARD_FRAGMENT, key, screenTitle);
-                results.add(new SearchResult.Builder()
-                        .setTitle(title)
-                        .setSummary(summary)
-                        .setRank(wordDiff)
-                        .setStableId(Objects.hash(VIRTUAL_KEYBOARD_FRAGMENT, key))
-                        .addBreadcrumbs(getVirtualKeyboardBreadCrumb())
-                        .setPayload(new ResultPayload(intent))
-                        .build());
-            }
-            return results;
-        }
-
-        private List<String> getPhysicalKeyboardBreadCrumb() {
-            if (mPhysicalKeyboardBreadcrumb == null || mPhysicalKeyboardBreadcrumb.isEmpty()) {
-                mPhysicalKeyboardBreadcrumb = mSiteMapManager.buildBreadCrumb(
-                        mContext, PHYSICAL_KEYBOARD_FRAGMENT,
-                        mContext.getString(R.string.physical_keyboard_title));
-            }
-            return mPhysicalKeyboardBreadcrumb;
-        }
-
-
-        private List<String> getVirtualKeyboardBreadCrumb() {
-            if (mVirtualKeyboardBreadcrumb == null || mVirtualKeyboardBreadcrumb.isEmpty()) {
-                final Context context = mContext;
-                mVirtualKeyboardBreadcrumb = mSiteMapManager.buildBreadCrumb(
-                        context, VIRTUAL_KEYBOARD_FRAGMENT,
-                        context.getString(R.string.add_virtual_keyboard));
-            }
-            return mVirtualKeyboardBreadcrumb;
-        }
-
-        private List<InputDevice> getPhysicalFullKeyboards() {
-            final List<InputDevice> keyboards = new ArrayList<>();
-            final int[] deviceIds = InputDevice.getDeviceIds();
-            if (deviceIds != null) {
-                for (int deviceId : deviceIds) {
-                    final InputDevice device = InputDevice.getDevice(deviceId);
-                    if (device != null && !device.isVirtual() && device.isFullKeyboard()) {
-                        keyboards.add(device);
-                    }
-                }
-            }
-            return keyboards;
-        }
-
-        private static List<InputMethodSubtype> getAllSubtypesOf(final InputMethodInfo imi) {
-            final int subtypeCount = imi.getSubtypeCount();
-            final List<InputMethodSubtype> allSubtypes = new ArrayList<>(subtypeCount);
-            for (int index = 0; index < subtypeCount; index++) {
-                allSubtypes.add(imi.getSubtypeAt(index));
-            }
-            return allSubtypes;
-        }
-    }
-}
diff --git a/src/com/android/settings/search/InstalledAppResultLoader.java b/src/com/android/settings/search/InstalledAppResultLoader.java
deleted file mode 100644
index e5d8ac1..0000000
--- a/src/com/android/settings/search/InstalledAppResultLoader.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.UserInfo;
-import android.net.Uri;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.provider.Settings;
-import android.support.annotation.VisibleForTesting;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.applications.manageapplications.ManageApplications;
-import com.android.settings.dashboard.SiteMapManager;
-import com.android.settingslib.wrapper.PackageManagerWrapper;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.FutureTask;
-
-/**
- * Search loader for installed apps.
- */
-public class InstalledAppResultLoader extends FutureTask<List<? extends SearchResult>> {
-
-    private static final String TAG = "InstalledAppFutureTask";
-
-    private static final int NAME_NO_MATCH = -1;
-    private static final Intent LAUNCHER_PROBE = new Intent(Intent.ACTION_MAIN)
-            .addCategory(Intent.CATEGORY_LAUNCHER);
-
-    public InstalledAppResultLoader(Context context, PackageManagerWrapper wrapper,
-            String query, SiteMapManager manager) {
-        super(new InstalledAppResultCallable(context, wrapper, query, manager));
-    }
-
-    /**
-     * Returns "difference" between appName and query string. appName must contain all
-     * characters from query as a prefix to a word, in the same order.
-     * If not, returns NAME_NO_MATCH.
-     * If they do match, returns an int value representing  how different they are,
-     * and larger values means they are less similar.
-     * <p/>
-     * Example:
-     * appName: Abcde, query: Abcde, Returns 0
-     * appName: Abcde, query: abc, Returns 2
-     * appName: Abcde, query: ab, Returns 3
-     * appName: Abcde, query: bc, Returns NAME_NO_MATCH
-     * appName: Abcde, query: xyz, Returns NAME_NO_MATCH
-     * appName: Abc de, query: de, Returns 4
-     * TODO: Move this to a common util class.
-     */
-    static int getWordDifference(String appName, String query) {
-        if (TextUtils.isEmpty(appName) || TextUtils.isEmpty(query)) {
-            return NAME_NO_MATCH;
-        }
-
-        final char[] queryTokens = query.toLowerCase().toCharArray();
-        final char[] appTokens = appName.toLowerCase().toCharArray();
-        final int appLength = appTokens.length;
-        if (queryTokens.length > appLength) {
-            return NAME_NO_MATCH;
-        }
-
-        int i = 0;
-        int j;
-
-        while (i < appLength) {
-            j = 0;
-            // Currently matching a prefix
-            while ((i + j < appLength) && (queryTokens[j] == appTokens[i + j])) {
-                // Matched the entire query
-                if (++j >= queryTokens.length) {
-                    // Use the diff in length as a proxy of how close the 2 words match.
-                    // Value range from 0 to infinity.
-                    return appLength - queryTokens.length;
-                }
-            }
-
-            i += j;
-
-            // Remaining string is longer that the query or we have search the whole app name.
-            if (queryTokens.length > appLength - i) {
-                return NAME_NO_MATCH;
-            }
-
-            // This is the first index where app name and query name are different
-            // Find the next space in the app name or the end of the app name.
-            while ((i < appLength) && (!Character.isWhitespace(appTokens[i++]))) ;
-
-            // Find the start of the next word
-            while ((i < appLength) && !(Character.isLetter(appTokens[i])
-                    || Character.isDigit(appTokens[i]))) {
-                // Increment in body because we cannot guarantee which condition was true
-                i++;
-            }
-        }
-        return NAME_NO_MATCH;
-    }
-
-    static class InstalledAppResultCallable implements
-            Callable<List<? extends SearchResult>> {
-
-        private final Context mContext;
-        private List<String> mBreadcrumb;
-        private SiteMapManager mSiteMapManager;
-        @VisibleForTesting
-        final String mQuery;
-        private final UserManager mUserManager;
-        private final PackageManagerWrapper mPackageManager;
-        private final List<ResolveInfo> mHomeActivities = new ArrayList<>();
-
-        public InstalledAppResultCallable(Context context, PackageManagerWrapper pmWrapper,
-                String query, SiteMapManager mapManager) {
-            mContext = context;
-            mSiteMapManager = mapManager;
-            mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
-            mPackageManager = pmWrapper;
-            mQuery = query;
-        }
-
-        @Override
-        public List<? extends SearchResult> call() throws Exception {
-            long startTime = System.currentTimeMillis();
-            final List<AppSearchResult> results = new ArrayList<>();
-            final PackageManager pm = mPackageManager.getPackageManager();
-
-            mHomeActivities.clear();
-            mPackageManager.getHomeActivities(mHomeActivities);
-
-            for (UserInfo user : getUsersToCount()) {
-                final List<ApplicationInfo> apps =
-                        mPackageManager.getInstalledApplicationsAsUser(
-                                PackageManager.MATCH_DISABLED_COMPONENTS
-                                        | PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS
-                                        | (user.isAdmin() ? PackageManager.MATCH_ANY_USER : 0),
-                                user.id);
-                for (ApplicationInfo info : apps) {
-                    if (!shouldIncludeAsCandidate(info, user)) {
-                        continue;
-                    }
-                    final CharSequence label = info.loadLabel(pm);
-                    final int wordDiff = getWordDifference(label.toString(), mQuery);
-                    if (wordDiff == NAME_NO_MATCH) {
-                        continue;
-                    }
-                    final Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-                            .setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-                            .setData(Uri.fromParts("package", info.packageName, null))
-                            .putExtra(SettingsActivity.EXTRA_SOURCE_METRICS_CATEGORY,
-                                    MetricsProto.MetricsEvent.DASHBOARD_SEARCH_RESULTS);
-
-                    final AppSearchResult.Builder builder = new AppSearchResult.Builder();
-                    builder.setAppInfo(info)
-                            .setStableId(Objects.hash(info.packageName, user.id))
-                            .setTitle(info.loadLabel(pm))
-                            .setRank(getRank(wordDiff))
-                            .addBreadcrumbs(getBreadCrumb())
-                            .setPayload(new ResultPayload(intent));
-                    results.add(builder.build());
-                }
-            }
-            Collections.sort(results);
-            Log.i(TAG, "App search loading took:" + (System.currentTimeMillis() - startTime));
-            return results;
-        }
-
-        /**
-         * Returns true if the candidate should be included in candidate list
-         * <p/>
-         * This method matches logic in {@code ApplicationState#FILTER_DOWNLOADED_AND_LAUNCHER}.
-         */
-        private boolean shouldIncludeAsCandidate(ApplicationInfo info, UserInfo user) {
-            // Not system app
-            if ((info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0
-                    || (info.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
-                return true;
-            }
-            // Shows up in launcher
-            final Intent launchIntent = new Intent(LAUNCHER_PROBE)
-                    .setPackage(info.packageName);
-            final List<ResolveInfo> intents = mPackageManager.queryIntentActivitiesAsUser(
-                    launchIntent,
-                    PackageManager.MATCH_DISABLED_COMPONENTS
-                            | PackageManager.MATCH_DIRECT_BOOT_AWARE
-                            | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
-                    user.id);
-            if (intents != null && intents.size() != 0) {
-                return true;
-            }
-            // Is launcher app itself
-            return isPackageInList(mHomeActivities, info.packageName);
-        }
-
-        private List<UserInfo> getUsersToCount() {
-            return mUserManager.getProfiles(UserHandle.myUserId());
-        }
-
-        private boolean isPackageInList(List<ResolveInfo> resolveInfos, String pkg) {
-            for (ResolveInfo info : resolveInfos) {
-                if (TextUtils.equals(info.activityInfo.packageName, pkg)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        private List<String> getBreadCrumb() {
-            if (mBreadcrumb == null || mBreadcrumb.isEmpty()) {
-                mBreadcrumb = mSiteMapManager.buildBreadCrumb(
-                        mContext, ManageApplications.class.getName(),
-                        mContext.getString(R.string.applications_settings));
-            }
-            return mBreadcrumb;
-        }
-
-        /**
-         * A temporary ranking scheme for installed apps.
-         *
-         * @param wordDiff difference between query length and app name length.
-         * @return the ranking.
-         */
-        private int getRank(int wordDiff) {
-            if (wordDiff < 6) {
-                return 2;
-            }
-            return 3;
-        }
-    }
-}
diff --git a/src/com/android/settings/search/IntentSearchViewHolder.java b/src/com/android/settings/search/IntentSearchViewHolder.java
deleted file mode 100644
index 8f6aa2c..0000000
--- a/src/com/android/settings/search/IntentSearchViewHolder.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package com.android.settings.search;
-
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.os.UserHandle;
-import android.support.annotation.VisibleForTesting;
-import android.util.Log;
-import android.view.View;
-
-import com.android.internal.logging.nano.MetricsProto;
-
-import java.util.List;
-
-/**
- * ViewHolder for intent based search results.
- * The DatabaseResultLoader is the primary use case for this ViewHolder.
- */
-public class IntentSearchViewHolder extends SearchViewHolder {
-
-    private static final String TAG = "IntentSearchViewHolder";
-    @VisibleForTesting
-    static final int REQUEST_CODE_NO_OP = 0;
-
-    public IntentSearchViewHolder(View view) {
-        super(view);
-    }
-
-    @Override
-    public int getClickActionMetricName() {
-        return MetricsProto.MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_RESULT;
-    }
-
-    @Override
-    public void onBind(final SearchFragment fragment, final SearchResult result) {
-        super.onBind(fragment, result);
-
-        itemView.setOnClickListener(v -> {
-            fragment.onSearchResultClicked(this, result);
-            final Intent intent = result.payload.getIntent();
-            // Use app user id to support work profile use case.
-            if (result instanceof AppSearchResult) {
-                AppSearchResult appResult = (AppSearchResult) result;
-                UserHandle userHandle = appResult.getAppUserHandle();
-                fragment.getActivity().startActivityAsUser(intent, userHandle);
-            } else {
-                final PackageManager pm = fragment.getActivity().getPackageManager();
-                final List<ResolveInfo> info = pm.queryIntentActivities(intent, 0 /* flags */);
-                if (info != null && !info.isEmpty()) {
-                    fragment.startActivityForResult(intent, REQUEST_CODE_NO_OP);
-                } else {
-                    Log.e(TAG, "Cannot launch search result, title: "
-                            + result.title + ", " + intent);
-                }
-            }
-        });
-    }
-}
diff --git a/src/com/android/settings/search/SavedQueryController.java b/src/com/android/settings/search/SavedQueryController.java
deleted file mode 100644
index eaba3d6..0000000
--- a/src/com/android/settings/search/SavedQueryController.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.app.LoaderManager;
-import android.content.Context;
-import android.content.Loader;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import com.android.settings.R;
-import com.android.settings.overlay.FeatureFactory;
-
-import java.util.List;
-
-public class SavedQueryController implements LoaderManager.LoaderCallbacks,
-        MenuItem.OnMenuItemClickListener {
-
-    // TODO: make a generic background task manager to handle one-off tasks like this one.
-    private static final String ARG_QUERY = "remove_query";
-    private static final String TAG = "SearchSavedQueryCtrl";
-
-    private static final int MENU_SEARCH_HISTORY = 1000;
-
-    private final Context mContext;
-    private final LoaderManager mLoaderManager;
-    private final SearchFeatureProvider mSearchFeatureProvider;
-    private final SearchResultsAdapter mResultAdapter;
-
-    public SavedQueryController(Context context, LoaderManager loaderManager,
-            SearchResultsAdapter resultsAdapter) {
-        mContext = context;
-        mLoaderManager = loaderManager;
-        mResultAdapter = resultsAdapter;
-        mSearchFeatureProvider = FeatureFactory.getFactory(context)
-                .getSearchFeatureProvider();
-    }
-
-    @Override
-    public Loader onCreateLoader(int id, Bundle args) {
-        switch (id) {
-            case SearchFragment.SearchLoaderId.SAVE_QUERY_TASK:
-                return new SavedQueryRecorder(mContext, args.getString(ARG_QUERY));
-            case SearchFragment.SearchLoaderId.REMOVE_QUERY_TASK:
-                return new SavedQueryRemover(mContext);
-            case SearchFragment.SearchLoaderId.SAVED_QUERIES:
-                return mSearchFeatureProvider.getSavedQueryLoader(mContext);
-        }
-        return null;
-    }
-
-    @Override
-    public void onLoadFinished(Loader loader, Object data) {
-        switch (loader.getId()) {
-            case SearchFragment.SearchLoaderId.REMOVE_QUERY_TASK:
-                mLoaderManager.restartLoader(SearchFragment.SearchLoaderId.SAVED_QUERIES,
-                        null /* args */, this /* callback */);
-                break;
-            case SearchFragment.SearchLoaderId.SAVED_QUERIES:
-                if (SettingsSearchIndexablesProvider.DEBUG) {
-                    Log.d(TAG, "Saved queries loaded");
-                }
-                mResultAdapter.displaySavedQuery((List<SearchResult>) data);
-                break;
-        }
-    }
-
-    @Override
-    public void onLoaderReset(Loader loader) {
-    }
-
-    @Override
-    public boolean onMenuItemClick(MenuItem item) {
-        if (item.getItemId() != MENU_SEARCH_HISTORY) {
-            return false;
-        }
-        removeQueries();
-        return true;
-    }
-
-    public void buildMenuItem(Menu menu) {
-        final MenuItem item =
-                menu.add(Menu.NONE, MENU_SEARCH_HISTORY, Menu.NONE, R.string.search_clear_history);
-        item.setOnMenuItemClickListener(this);
-    }
-
-    public void saveQuery(String query) {
-        final Bundle args = new Bundle();
-        args.putString(ARG_QUERY, query);
-        mLoaderManager.restartLoader(SearchFragment.SearchLoaderId.SAVE_QUERY_TASK, args,
-                this /* callback */);
-    }
-
-    /**
-     * Remove all saved queries from DB
-     */
-    public void removeQueries() {
-        final Bundle args = new Bundle();
-        mLoaderManager.restartLoader(SearchFragment.SearchLoaderId.REMOVE_QUERY_TASK, args,
-                this /* callback */);
-    }
-
-    public void loadSavedQueries() {
-        if (SettingsSearchIndexablesProvider.DEBUG) {
-            Log.d(TAG, "loading saved queries");
-        }
-        mLoaderManager.restartLoader(SearchFragment.SearchLoaderId.SAVED_QUERIES, null /* args */,
-                this /* callback */);
-    }
-}
diff --git a/src/com/android/settings/search/SavedQueryLoader.java b/src/com/android/settings/search/SavedQueryLoader.java
deleted file mode 100644
index 5df3610..0000000
--- a/src/com/android/settings/search/SavedQueryLoader.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.support.annotation.VisibleForTesting;
-
-import com.android.settings.search.IndexDatabaseHelper.SavedQueriesColumns;
-import com.android.settingslib.utils.AsyncLoader;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Loader for recently searched queries.
- */
-public class SavedQueryLoader extends AsyncLoader<List<? extends SearchResult>> {
-
-    // Max number of proposed suggestions
-    @VisibleForTesting
-    static final int MAX_PROPOSED_SUGGESTIONS = 5;
-
-    private final SQLiteDatabase mDatabase;
-
-    public SavedQueryLoader(Context context) {
-        super(context);
-        mDatabase = IndexDatabaseHelper.getInstance(context).getReadableDatabase();
-    }
-
-    @Override
-    protected void onDiscardResult(List<? extends SearchResult> result) {
-
-    }
-
-    @Override
-    public List<? extends SearchResult> loadInBackground() {
-        try (final Cursor cursor = mDatabase.query(
-                IndexDatabaseHelper.Tables.TABLE_SAVED_QUERIES /* table */,
-                new String[]{SavedQueriesColumns.QUERY} /* columns */,
-                null /* selection */,
-                null /* selectionArgs */,
-                null /* groupBy */,
-                null /* having */,
-                "rowId DESC" /* orderBy */,
-                String.valueOf(MAX_PROPOSED_SUGGESTIONS) /* limit */)) {
-            return convertCursorToResult(cursor);
-        }
-    }
-
-    private List<SearchResult> convertCursorToResult(Cursor cursor) {
-        final List<SearchResult> results = new ArrayList<>();
-        while (cursor.moveToNext()) {
-            final SavedQueryPayload payload = new SavedQueryPayload(
-                    cursor.getString(cursor.getColumnIndex(SavedQueriesColumns.QUERY)));
-            results.add(new SearchResult.Builder()
-                    .setStableId(payload.hashCode())
-                    .setTitle(payload.query)
-                    .setPayload(payload)
-                    .build());
-        }
-        return results;
-    }
-}
diff --git a/src/com/android/settings/search/SavedQueryPayload.java b/src/com/android/settings/search/SavedQueryPayload.java
deleted file mode 100644
index 0a151fc..0000000
--- a/src/com/android/settings/search/SavedQueryPayload.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.os.Parcel;
-import android.support.annotation.VisibleForTesting;
-
-/**
- * {@link ResultPayload} for saved query.
- */
-public class SavedQueryPayload extends ResultPayload {
-
-    public final String query;
-
-    public SavedQueryPayload(String query) {
-        super(null /* Intent */);
-        this.query = query;
-    }
-
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-    SavedQueryPayload(Parcel in) {
-        super(null /* Intent */);
-        query = in.readString();
-    }
-
-    @Override
-    public int getType() {
-        return PayloadType.SAVED_QUERY;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(query);
-    }
-
-    public static final Creator<SavedQueryPayload> CREATOR = new Creator<SavedQueryPayload>() {
-        @Override
-        public SavedQueryPayload createFromParcel(Parcel in) {
-            return new SavedQueryPayload(in);
-        }
-
-        @Override
-        public SavedQueryPayload[] newArray(int size) {
-            return new SavedQueryPayload[size];
-        }
-    };
-}
diff --git a/src/com/android/settings/search/SavedQueryRecorder.java b/src/com/android/settings/search/SavedQueryRecorder.java
deleted file mode 100644
index b3b0bb8..0000000
--- a/src/com/android/settings/search/SavedQueryRecorder.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteException;
-import android.util.Log;
-
-import com.android.settings.search.IndexDatabaseHelper;
-import com.android.settingslib.utils.AsyncLoader;
-
-import static com.android.settings.search.IndexDatabaseHelper.Tables.TABLE_SAVED_QUERIES;
-
-/**
- * A background task to update saved queries.
- */
-public class SavedQueryRecorder extends AsyncLoader<Void> {
-
-    private static final String LOG_TAG = "SavedQueryRecorder";
-
-    // Max number of saved search queries (who will be used for proposing suggestions)
-    private static long MAX_SAVED_SEARCH_QUERY = 64;
-
-    private final String mQuery;
-
-    public SavedQueryRecorder(Context context, String query) {
-        super(context);
-        mQuery = query;
-    }
-
-    @Override
-    protected void onDiscardResult(Void result) {
-
-    }
-
-    @Override
-    public Void loadInBackground() {
-        final long now = System.currentTimeMillis();
-
-        final ContentValues values = new ContentValues();
-        values.put(IndexDatabaseHelper.SavedQueriesColumns.QUERY, mQuery);
-        values.put(IndexDatabaseHelper.SavedQueriesColumns.TIME_STAMP, now);
-
-        final SQLiteDatabase database = getWritableDatabase();
-        if (database == null) {
-            return null;
-        }
-
-        long lastInsertedRowId;
-        try {
-            // First, delete all saved queries that are the same
-            database.delete(TABLE_SAVED_QUERIES,
-                    IndexDatabaseHelper.SavedQueriesColumns.QUERY + " = ?",
-                    new String[]{mQuery});
-
-            // Second, insert the saved query
-            lastInsertedRowId = database.insertOrThrow(TABLE_SAVED_QUERIES, null, values);
-
-            // Last, remove "old" saved queries
-            final long delta = lastInsertedRowId - MAX_SAVED_SEARCH_QUERY;
-            if (delta > 0) {
-                int count = database.delete(TABLE_SAVED_QUERIES,
-                        "rowId <= ?",
-                        new String[]{Long.toString(delta)});
-                Log.d(LOG_TAG, "Deleted '" + count + "' saved Search query(ies)");
-            }
-        } catch (Exception e) {
-            Log.d(LOG_TAG, "Cannot update saved Search queries", e);
-        }
-        return null;
-    }
-
-    private SQLiteDatabase getWritableDatabase() {
-        try {
-            return IndexDatabaseHelper.getInstance(getContext()).getWritableDatabase();
-        } catch (SQLiteException e) {
-            Log.e(LOG_TAG, "Cannot open writable database", e);
-            return null;
-        }
-    }
-}
diff --git a/src/com/android/settings/search/SavedQueryRemover.java b/src/com/android/settings/search/SavedQueryRemover.java
deleted file mode 100644
index c6abe97..0000000
--- a/src/com/android/settings/search/SavedQueryRemover.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import static com.android.settings.search.IndexDatabaseHelper.Tables.TABLE_SAVED_QUERIES;
-
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteException;
-import android.util.Log;
-
-import com.android.settingslib.utils.AsyncLoader;
-
-public class SavedQueryRemover extends AsyncLoader<Void> {
-
-    private static final String LOG_TAG = "SavedQueryRemover";
-
-    public SavedQueryRemover(Context context) {
-        super(context);
-    }
-
-    @Override
-    public Void loadInBackground() {
-        final SQLiteDatabase database = getWritableDatabase();
-        try {
-            // First, delete all saved queries that are the same
-            database.delete(TABLE_SAVED_QUERIES,
-                    null /* where */,
-                    null /* whereArgs */);
-        } catch (Exception e) {
-            Log.d(LOG_TAG, "Cannot update saved Search queries", e);
-        }
-        return null;
-    }
-
-    @Override
-    protected void onDiscardResult(Void result) {
-
-    }
-
-    private SQLiteDatabase getWritableDatabase() {
-        try {
-            return IndexDatabaseHelper.getInstance(getContext()).getWritableDatabase();
-        } catch (SQLiteException e) {
-            Log.e(LOG_TAG, "Cannot open writable database", e);
-            return null;
-        }
-    }
-}
diff --git a/src/com/android/settings/search/SavedQueryViewHolder.java b/src/com/android/settings/search/SavedQueryViewHolder.java
deleted file mode 100644
index a8d449d..0000000
--- a/src/com/android/settings/search/SavedQueryViewHolder.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.view.View;
-import android.widget.TextView;
-
-import com.android.internal.logging.nano.MetricsProto;
-
-public class SavedQueryViewHolder extends SearchViewHolder {
-
-    public final TextView titleView;
-
-    public SavedQueryViewHolder(View view) {
-        super(view);
-        titleView = view.findViewById(android.R.id.title);
-    }
-
-    @Override
-    public int getClickActionMetricName() {
-        return MetricsProto.MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_SAVED_QUERY;
-    }
-
-    @Override
-    public void onBind(SearchFragment fragment, SearchResult result) {
-        itemView.setOnClickListener(v -> fragment.onSavedQueryClicked(result.title));
-        titleView.setText(result.title);
-    }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/search/SearchActivity.java b/src/com/android/settings/search/SearchActivity.java
deleted file mode 100644
index 61a580b..0000000
--- a/src/com/android/settings/search/SearchActivity.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.app.Activity;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.os.Bundle;
-
-import android.view.WindowManager;
-import com.android.settings.R;
-
-public class SearchActivity extends Activity {
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.search_main);
-        // Keeps layouts in-place when keyboard opens.
-        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
-
-        FragmentManager fragmentManager = getFragmentManager();
-        Fragment fragment = fragmentManager.findFragmentById(R.id.main_content);
-        if (fragment == null) {
-            fragmentManager.beginTransaction()
-                    .add(R.id.main_content, new SearchFragment())
-                    .commit();
-        }
-    }
-}
diff --git a/src/com/android/settings/search/SearchFeatureProvider.java b/src/com/android/settings/search/SearchFeatureProvider.java
index b9d5045..76da18e 100644
--- a/src/com/android/settings/search/SearchFeatureProvider.java
+++ b/src/com/android/settings/search/SearchFeatureProvider.java
@@ -21,18 +21,12 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.util.FeatureFlagUtils;
-import android.util.Pair;
-import android.view.View;
 import android.widget.Toolbar;
 
-import com.android.settings.core.FeatureFlags;
 import com.android.settings.dashboard.SiteMapManager;
 import com.android.settings.overlay.FeatureFactory;
 
-import java.util.List;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.FutureTask;
 
 /**
  * FeatureProvider for Settings Search
@@ -51,57 +45,17 @@
             throws SecurityException, IllegalArgumentException;
 
     /**
-     * Returns a new loader to get settings search results.
-     */
-    SearchResultLoader getSearchResultLoader(Context context, String query);
-
-    /**
-     * Returns a new loader to search in index database.
-     */
-    DatabaseResultLoader getStaticSearchResultTask(Context context, String query);
-
-    /**
-     * Returns a new loader to search installed apps.
-     */
-    InstalledAppResultLoader getInstalledAppSearchTask(Context context, String query);
-
-    /**
-     * Returns a new loader to search accessibility services.
-     */
-    AccessibilityServiceResultLoader getAccessibilityServiceResultTask(Context context,
-            String query);
-
-    /**
-     * Returns a new loader to search input devices.
-     */
-    InputDeviceResultLoader getInputDeviceResultTask(Context context, String query);
-
-    /**
-     * Returns a new loader to get all recently saved queries search terms.
-     */
-    SavedQueryLoader getSavedQueryLoader(Context context);
-
-    /**
-     * Returns the manager for indexing Settings data.
-     */
-    DatabaseIndexingManager getIndexingManager(Context context);
-
-    /**
      * Returns the manager for looking up breadcrumbs.
      */
     SiteMapManager getSiteMapManager();
 
     /**
-     * Updates the Settings indexes and calls {@link IndexingCallback#onIndexingFinished()} on
-     * {@param callback} when indexing is complete.
-     */
-    void updateIndexAsync(Context context, IndexingCallback callback);
-
-    /**
      * Synchronously updates the Settings database.
      */
     void updateIndex(Context context);
 
+    DatabaseIndexingManager getIndexingManager(Context context);
+
     /**
      * @returns true when indexing is complete.
      */
@@ -112,64 +66,8 @@
      */
     ExecutorService getExecutorService();
 
-    /**
-     * Initializes the feedback button in case it was dismissed.
-     */
-    default void initFeedbackButton() {
-    }
-
-    /**
-     * Show a button users can click to submit feedback on the quality of the search results.
-     */
-    default void showFeedbackButton(SearchFragment fragment, View view) {
-    }
-
-    /**
-     * Hide the feedback button shown by
-     * {@link #showFeedbackButton(SearchFragment fragment, View view) showFeedbackButton}
-     */
-    default void hideFeedbackButton() {
-    }
-
-    /**
-     * Notify that a search result is clicked.
-     *
-     * @param context      application context
-     * @param query        input user query
-     * @param searchResult clicked result
-     */
-    default void searchResultClicked(Context context, String query, SearchResult searchResult) {
-    }
-
-    /**
-     * @return true to enable search ranking.
-     */
-    default boolean isSmartSearchRankingEnabled(Context context) {
-        return false;
-    }
-
-    /**
-     * @return smart ranking timeout in milliseconds.
-     */
-    default long smartSearchRankingTimeoutMs(Context context) {
-        return 300L;
-    }
-
-    /**
-     * Prepare for search ranking predictions to avoid latency on the first prediction call.
-     */
-    default void searchRankingWarmup(Context context) {
-    }
-
-    /**
-     * Return a FutureTask to get a list of scores for search results.
-     */
-    default FutureTask<List<Pair<String, Float>>> getRankerTask(Context context, String query) {
-        return null;
-    }
-
-    default boolean isSearchV2Enabled(Context context) {
-        return FeatureFlagUtils.isEnabled(context, FeatureFlags.SEARCH_V2);
+    default String getSettingsIntelligencePkgName() {
+        return "com.android.settings.intelligence";
     }
 
     /**
@@ -180,12 +78,9 @@
             return;
         }
         toolbar.setOnClickListener(tb -> {
-            final Intent intent;
-            if (isSearchV2Enabled(activity)) {
-                intent = SEARCH_UI_INTENT;
-            } else {
-                intent = new Intent(activity, SearchActivity.class);
-            }
+            final Intent intent = SEARCH_UI_INTENT;
+            intent.setPackage(getSettingsIntelligencePkgName());
+
             FeatureFactory.getFactory(
                     activity.getApplicationContext()).getSlicesFeatureProvider()
                     .indexSliceDataAsync(activity.getApplicationContext());
diff --git a/src/com/android/settings/search/SearchFeatureProviderImpl.java b/src/com/android/settings/search/SearchFeatureProviderImpl.java
index 1c96714..d17c033 100644
--- a/src/com/android/settings/search/SearchFeatureProviderImpl.java
+++ b/src/com/android/settings/search/SearchFeatureProviderImpl.java
@@ -20,13 +20,11 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.text.TextUtils;
-import android.util.Log;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.dashboard.SiteMapManager;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.indexing.IndexData;
-import com.android.settingslib.wrapper.PackageManagerWrapper;
 
 import java.util.Locale;
 import java.util.concurrent.ExecutorService;
@@ -63,40 +61,6 @@
     }
 
     @Override
-    public SearchResultLoader getSearchResultLoader(Context context, String query) {
-        return new SearchResultLoader(context, cleanQuery(query));
-    }
-
-    @Override
-    public DatabaseResultLoader getStaticSearchResultTask(Context context, String query) {
-        return new DatabaseResultLoader(context, cleanQuery(query), getSiteMapManager());
-    }
-
-    @Override
-    public InstalledAppResultLoader getInstalledAppSearchTask(Context context, String query) {
-        return new InstalledAppResultLoader(
-                context, new PackageManagerWrapper(context.getPackageManager()),
-                cleanQuery(query), getSiteMapManager());
-    }
-
-    @Override
-    public AccessibilityServiceResultLoader getAccessibilityServiceResultTask(Context context,
-            String query) {
-        return new AccessibilityServiceResultLoader(context, cleanQuery(query),
-                getSiteMapManager());
-    }
-
-    @Override
-    public InputDeviceResultLoader getInputDeviceResultTask(Context context, String query) {
-        return new InputDeviceResultLoader(context, cleanQuery(query), getSiteMapManager());
-    }
-
-    @Override
-    public SavedQueryLoader getSavedQueryLoader(Context context) {
-        return new SavedQueryLoader(context);
-    }
-
-    @Override
     public DatabaseIndexingManager getIndexingManager(Context context) {
         if (mDatabaseIndexingManager == null) {
             mDatabaseIndexingManager = new DatabaseIndexingManager(context.getApplicationContext());
@@ -117,14 +81,6 @@
     }
 
     @Override
-    public void updateIndexAsync(Context context, IndexingCallback callback) {
-        if (SettingsSearchIndexablesProvider.DEBUG) {
-            Log.d(TAG, "updating index async");
-        }
-        getIndexingManager(context).indexDatabase(callback);
-    }
-
-    @Override
     public void updateIndex(Context context) {
         long indexStartTime = System.currentTimeMillis();
         getIndexingManager(context).performIndexing();
@@ -145,10 +101,6 @@
         return false;
     }
 
-    protected String getSettingsIntelligencePkgName() {
-        return "com.android.settings.intelligence";
-    }
-
     /**
      * A generic method to make the query suitable for searching the database.
      *
diff --git a/src/com/android/settings/search/SearchFragment.java b/src/com/android/settings/search/SearchFragment.java
deleted file mode 100644
index ed7a2ee..0000000
--- a/src/com/android/settings/search/SearchFragment.java
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.app.Activity;
-import android.app.LoaderManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.Loader;
-import android.os.Bundle;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
-import android.util.EventLog;
-import android.util.Log;
-import android.util.Pair;
-import android.util.TypedValue;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.LinearLayout;
-import android.widget.SearchView;
-import android.widget.TextView;
-import android.widget.Toolbar;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.EventLogTags;
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.Utils;
-import com.android.settings.core.InstrumentedFragment;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.ActionBarShadowController;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * This fragment manages the lifecycle of indexing and searching.
- *
- * In onCreate, the indexing process is initiated in DatabaseIndexingManager.
- * While the indexing is happening, loaders are blocked from accessing the database, but the user
- * is free to start typing their query.
- *
- * When the indexing is complete, the fragment gets a callback to initialize the loaders and search
- * the query if the user has entered text.
- */
-public class SearchFragment extends InstrumentedFragment implements SearchView.OnQueryTextListener,
-        LoaderManager.LoaderCallbacks<List<? extends SearchResult>>, IndexingCallback {
-    private static final String TAG = "SearchFragment";
-
-    // State values
-    private static final String STATE_QUERY = "state_query";
-    private static final String STATE_SHOWING_SAVED_QUERY = "state_showing_saved_query";
-    private static final String STATE_NEVER_ENTERED_QUERY = "state_never_entered_query";
-
-    static final class SearchLoaderId {
-        // Search Query IDs
-        public static final int SEARCH_RESULT = 1;
-
-        // Saved Query IDs
-        public static final int SAVE_QUERY_TASK = 2;
-        public static final int REMOVE_QUERY_TASK = 3;
-        public static final int SAVED_QUERIES = 4;
-    }
-
-    @VisibleForTesting
-    String mQuery;
-
-    private boolean mNeverEnteredQuery = true;
-    @VisibleForTesting
-    boolean mShowingSavedQuery;
-    private MetricsFeatureProvider mMetricsFeatureProvider;
-    @VisibleForTesting
-    SavedQueryController mSavedQueryController;
-
-    @VisibleForTesting
-    SearchFeatureProvider mSearchFeatureProvider;
-
-    @VisibleForTesting
-    SearchResultsAdapter mSearchAdapter;
-
-    @VisibleForTesting
-    RecyclerView mResultsRecyclerView;
-    @VisibleForTesting
-    SearchView mSearchView;
-    @VisibleForTesting
-    LinearLayout mNoResultsView;
-
-    @VisibleForTesting
-    final RecyclerView.OnScrollListener mScrollListener = new RecyclerView.OnScrollListener() {
-        @Override
-        public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
-            if (dy != 0) {
-                hideKeyboard();
-            }
-        }
-    };
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.DASHBOARD_SEARCH_RESULTS;
-    }
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        mSearchFeatureProvider = FeatureFactory.getFactory(context).getSearchFeatureProvider();
-        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        long startTime = System.currentTimeMillis();
-        setHasOptionsMenu(true);
-
-        final LoaderManager loaderManager = getLoaderManager();
-        mSearchAdapter = new SearchResultsAdapter(this /* fragment */);
-        mSavedQueryController = new SavedQueryController(
-                getContext(), loaderManager, mSearchAdapter);
-        mSearchFeatureProvider.initFeedbackButton();
-
-        if (savedInstanceState != null) {
-            mQuery = savedInstanceState.getString(STATE_QUERY);
-            mNeverEnteredQuery = savedInstanceState.getBoolean(STATE_NEVER_ENTERED_QUERY);
-            mShowingSavedQuery = savedInstanceState.getBoolean(STATE_SHOWING_SAVED_QUERY);
-        } else {
-            mShowingSavedQuery = true;
-        }
-
-        final Activity activity = getActivity();
-        // Run the Index update only if we have some space
-        if (!Utils.isLowStorage(activity)) {
-            mSearchFeatureProvider.updateIndexAsync(activity, this /* indexingCallback */);
-        } else {
-            Log.w(TAG, "Cannot update the Indexer as we are running low on storage space!");
-        }
-        if (SettingsSearchIndexablesProvider.DEBUG) {
-            Log.d(TAG, "onCreate spent " + (System.currentTimeMillis() - startTime) + " ms");
-        }
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        super.onCreateOptionsMenu(menu, inflater);
-        mSavedQueryController.buildMenuItem(menu);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        final View view = inflater.inflate(R.layout.search_panel, container, false);
-        mResultsRecyclerView = view.findViewById(R.id.list_results);
-        mResultsRecyclerView.setAdapter(mSearchAdapter);
-        mResultsRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
-        mResultsRecyclerView.addOnScrollListener(mScrollListener);
-
-        mNoResultsView = view.findViewById(R.id.no_results_layout);
-
-        Toolbar toolbar = view.findViewById(R.id.search_toolbar);
-        getActivity().setActionBar(toolbar);
-        getActivity().getActionBar().setDisplayHomeAsUpEnabled(true);
-
-        mSearchView = toolbar.findViewById(R.id.search_view);
-        mSearchView.setQuery(mQuery, false /* submitQuery */);
-        mSearchView.setOnQueryTextListener(this);
-        mSearchView.requestFocus();
-
-        // Updating internal views inside SearchView was the easiest way to get this too look right.
-        // Instead of grabbing the TextView directly, we grab it as a view and do an instanceof
-        // check. This ensures if we return, say, a LinearLayout in the tests, they won't fail.
-        View searchText = mSearchView.findViewById(com.android.internal.R.id.search_src_text);
-        if (searchText instanceof TextView) {
-            TextView searchTextView = (TextView) searchText;
-            searchTextView.setTextColor(getContext().getColorStateList(
-                    com.android.internal.R.color.text_color_primary));
-            searchTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
-                    getResources().getDimension(R.dimen.search_bar_text_size));
-
-        }
-        View editFrame = mSearchView.findViewById(com.android.internal.R.id.search_edit_frame);
-        if (editFrame != null) {
-            ViewGroup.MarginLayoutParams params =
-                    (ViewGroup.MarginLayoutParams) editFrame.getLayoutParams();
-            params.setMarginStart(0);
-            editFrame.setLayoutParams(params);
-        }
-        ActionBarShadowController.attachToRecyclerView(
-                view.findViewById(R.id.search_bar_container), getLifecycle(), mResultsRecyclerView);
-        return view;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        Context appContext = getContext().getApplicationContext();
-        if (mSearchFeatureProvider.isSmartSearchRankingEnabled(appContext)) {
-            mSearchFeatureProvider.searchRankingWarmup(appContext);
-        }
-        requery();
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        final Activity activity = getActivity();
-        if (activity != null && activity.isFinishing()) {
-            if (mNeverEnteredQuery) {
-                mMetricsFeatureProvider.action(activity,
-                        MetricsEvent.ACTION_LEAVE_SEARCH_RESULT_WITHOUT_QUERY);
-            }
-        }
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putString(STATE_QUERY, mQuery);
-        outState.putBoolean(STATE_NEVER_ENTERED_QUERY, mNeverEnteredQuery);
-        outState.putBoolean(STATE_SHOWING_SAVED_QUERY, mShowingSavedQuery);
-    }
-
-    @Override
-    public boolean onQueryTextChange(String query) {
-        if (TextUtils.equals(query, mQuery)) {
-            return true;
-        }
-
-        final boolean isEmptyQuery = TextUtils.isEmpty(query);
-
-        // Hide no-results-view when the new query is not a super-string of the previous
-        if (mQuery != null
-                && mNoResultsView.getVisibility() == View.VISIBLE
-                && query.length() < mQuery.length()) {
-            mNoResultsView.setVisibility(View.GONE);
-        }
-
-        mNeverEnteredQuery = false;
-        mQuery = query;
-
-        // If indexing is not finished, register the query text, but don't search.
-        if (!mSearchFeatureProvider.isIndexingComplete(getActivity())) {
-            return true;
-        }
-
-        if (isEmptyQuery) {
-            final LoaderManager loaderManager = getLoaderManager();
-            loaderManager.destroyLoader(SearchLoaderId.SEARCH_RESULT);
-            mShowingSavedQuery = true;
-            mSavedQueryController.loadSavedQueries();
-            mSearchFeatureProvider.hideFeedbackButton();
-        } else {
-            restartLoaders();
-        }
-
-        return true;
-    }
-
-    @Override
-    public boolean onQueryTextSubmit(String query) {
-        // Save submitted query.
-        mSavedQueryController.saveQuery(mQuery);
-        hideKeyboard();
-        return true;
-    }
-
-    @Override
-    public Loader<List<? extends SearchResult>> onCreateLoader(int id, Bundle args) {
-        final Activity activity = getActivity();
-
-        switch(id) {
-            case SearchLoaderId.SEARCH_RESULT:
-                return mSearchFeatureProvider.getSearchResultLoader(activity, mQuery);
-            default:
-                return null;
-        }
-    }
-
-    @Override
-    public void onLoadFinished(Loader<List<? extends SearchResult>> loader,
-            List<? extends SearchResult> data) {
-        mSearchAdapter.postSearchResults(data);
-    }
-
-    @Override
-    public void onLoaderReset(Loader<List<? extends SearchResult>> loader) {
-    }
-
-    /**
-     * Gets called when Indexing is completed.
-     */
-    @Override
-    public void onIndexingFinished() {
-        if (getActivity() == null) {
-            return;
-        }
-        if (mShowingSavedQuery) {
-            mSavedQueryController.loadSavedQueries();
-        } else {
-            final LoaderManager loaderManager = getLoaderManager();
-            loaderManager.initLoader(SearchLoaderId.SEARCH_RESULT, null /* args */,
-                    this /* callback */);
-        }
-
-        requery();
-    }
-
-    public void onSearchResultClicked(SearchViewHolder resultViewHolder, SearchResult result,
-            Pair<Integer, Object>... logTaggedData) {
-        logSearchResultClicked(resultViewHolder, result, logTaggedData);
-        mSearchFeatureProvider.searchResultClicked(getContext(), mQuery, result);
-        mSavedQueryController.saveQuery(mQuery);
-    }
-
-    public void onSearchResultsDisplayed(int resultCount) {
-        if (resultCount == 0) {
-            mNoResultsView.setVisibility(View.VISIBLE);
-            mMetricsFeatureProvider.visible(getContext(), getMetricsCategory(),
-                    MetricsEvent.SETTINGS_SEARCH_NO_RESULT);
-            // Log settings_latency for search end-to-end.
-            EventLog.writeEvent(EventLogTags.SETTINGS_LATENCY, 1, 10);
-        } else {
-            mNoResultsView.setVisibility(View.GONE);
-            mResultsRecyclerView.scrollToPosition(0);
-        }
-        mMetricsFeatureProvider.action(
-                getVisibilityLogger(), MetricsEvent.ACTION_SEARCH_RESULTS, 1);
-        mSearchFeatureProvider.showFeedbackButton(this, getView());
-    }
-
-    public void onSavedQueryClicked(CharSequence query) {
-        final String queryString = query.toString();
-        mMetricsFeatureProvider.action(getContext(),
-                MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_SAVED_QUERY);
-        mSearchView.setQuery(queryString, false /* submit */);
-        onQueryTextChange(queryString);
-    }
-
-    private void restartLoaders() {
-        mShowingSavedQuery = false;
-        final LoaderManager loaderManager = getLoaderManager();
-        loaderManager.restartLoader(
-                SearchLoaderId.SEARCH_RESULT, null /* args */, this /* callback */);
-    }
-
-    public String getQuery() {
-        return mQuery;
-    }
-
-    public List<SearchResult> getSearchResults() {
-        return mSearchAdapter.getSearchResults();
-    }
-
-    private void requery() {
-        if (TextUtils.isEmpty(mQuery)) {
-            return;
-        }
-        final String query = mQuery;
-        mQuery = "";
-        onQueryTextChange(query);
-    }
-
-    private void hideKeyboard() {
-        final Activity activity = getActivity();
-        if (activity != null) {
-            View view = activity.getCurrentFocus();
-            InputMethodManager imm = (InputMethodManager)
-                    activity.getSystemService(Context.INPUT_METHOD_SERVICE);
-            imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
-        }
-
-        if (mResultsRecyclerView != null) {
-            mResultsRecyclerView.requestFocus();
-        }
-    }
-
-    private void logSearchResultClicked(SearchViewHolder resultViewHolder, SearchResult result,
-            Pair<Integer, Object>... logTaggedData) {
-        final Intent intent = result.payload.getIntent();
-        if (intent == null) {
-            Log.w(TAG, "Skipped logging click on search result because of null intent, which can " +
-                    "happen on saved query results.");
-            return;
-        }
-        final ComponentName cn = intent.getComponent();
-        String resultName = intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT);
-        if (TextUtils.isEmpty(resultName) && cn != null) {
-            resultName = cn.flattenToString();
-        }
-        final List<Pair<Integer, Object>> taggedData = new ArrayList<>();
-        if (logTaggedData != null) {
-            taggedData.addAll(Arrays.asList(logTaggedData));
-        }
-        taggedData.add(Pair.create(
-                MetricsEvent.FIELD_SETTINGS_SEARCH_RESULT_COUNT,
-                mSearchAdapter.getItemCount()));
-        taggedData.add(Pair.create(
-                MetricsEvent.FIELD_SETTINGS_SEARCH_RESULT_RANK,
-                resultViewHolder.getAdapterPosition()));
-        // TODO (b/67744820) Move metrics to SettingsIntelligence (including ranking state).
-        taggedData.add(Pair.create(
-                MetricsEvent.FIELD_SETTINGS_SEARCH_QUERY_LENGTH,
-                TextUtils.isEmpty(mQuery) ? 0 : mQuery.length()));
-
-        mMetricsFeatureProvider.action(getContext(),
-                resultViewHolder.getClickActionMetricName(),
-                resultName,
-                taggedData.toArray(new Pair[0]));
-    }
-}
diff --git a/src/com/android/settings/search/SearchResultAggregator.java b/src/com/android/settings/search/SearchResultAggregator.java
deleted file mode 100644
index 890e3f0..0000000
--- a/src/com/android/settings/search/SearchResultAggregator.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package com.android.settings.search;
-
-import android.annotation.NonNull;
-import android.content.Context;
-import android.util.Log;
-import android.util.SparseArray;
-
-import com.android.settings.overlay.FeatureFactory;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-/**
- * Collects the sorted list of all setting search results.
- *
- * TODO (b/64939692) Convert the timing logs to metrics
- */
-public class SearchResultAggregator {
-
-    private static final String TAG = "SearchResultAggregator";
-
-    /**
-     * Timeout for first task. Allows for longer delay.
-     */
-    private static final long LONG_CHECK_TASK_TIMEOUT_MS = 500;
-
-    /**
-     * Timeout for subsequent tasks to allow for fast returning tasks.
-     */
-    private static final long SHORT_CHECK_TASK_TIMEOUT_MS = 150;
-
-    private static SearchResultAggregator sResultAggregator;
-
-    // TODO (b/33577327) Merge the other loaders into a single dynamic loader
-    static final class ResultLoaderId {
-        static final int STATIC_RESULTS = 1;
-        static final int INSTALLED_RESULTS = 2;
-        static final int INPUT_RESULTS = 3;
-        static final int ACCESSIBILITY_RESULTS = 4;
-    }
-
-    private SearchResultAggregator() {
-    }
-
-    public static SearchResultAggregator getInstance() {
-        if (sResultAggregator == null) {
-            sResultAggregator = new SearchResultAggregator();
-        }
-
-        return sResultAggregator;
-    }
-
-    @NonNull
-    public synchronized List<? extends SearchResult> fetchResults(Context context, String query) {
-        SearchFeatureProvider mFeatureProvider = FeatureFactory.getFactory(
-                context).getSearchFeatureProvider();
-        ExecutorService executorService = mFeatureProvider.getExecutorService();
-
-        final DatabaseResultLoader staticResultsTask =
-                mFeatureProvider.getStaticSearchResultTask(context, query);
-        final InstalledAppResultLoader installedAppTask =
-                mFeatureProvider.getInstalledAppSearchTask(context, query);
-        final InputDeviceResultLoader inputDevicesTask =
-                mFeatureProvider.getInputDeviceResultTask(context, query);
-        final AccessibilityServiceResultLoader accessibilityServicesTask =
-                mFeatureProvider.getAccessibilityServiceResultTask(context,
-                        query);
-
-        executorService.execute(staticResultsTask);
-        executorService.execute(installedAppTask);
-        executorService.execute(inputDevicesTask);
-        executorService.execute(accessibilityServicesTask);
-
-        SparseArray<List<? extends SearchResult>> resultsArray = new SparseArray<>();
-        List<? extends SearchResult> EMPTY_LIST = new ArrayList<>();
-
-        long allTasksStart = System.currentTimeMillis();
-        try {
-            resultsArray.put(ResultLoaderId.INPUT_RESULTS,
-                    inputDevicesTask.get(SHORT_CHECK_TASK_TIMEOUT_MS, TimeUnit.MILLISECONDS));
-        } catch (TimeoutException | InterruptedException | ExecutionException e) {
-            Log.d(TAG, "Could not retrieve input devices results in time: " + e);
-            resultsArray.put(ResultLoaderId.INPUT_RESULTS, EMPTY_LIST);
-        }
-
-        try {
-            resultsArray.put(ResultLoaderId.ACCESSIBILITY_RESULTS,
-                    accessibilityServicesTask.get(SHORT_CHECK_TASK_TIMEOUT_MS,
-                            TimeUnit.MILLISECONDS));
-        } catch (TimeoutException | InterruptedException | ExecutionException e) {
-            Log.d(TAG, "Could not retrieve accessibility results in time: " + e);
-            resultsArray.put(ResultLoaderId.ACCESSIBILITY_RESULTS, EMPTY_LIST);
-        }
-
-        try {
-            resultsArray.put(ResultLoaderId.STATIC_RESULTS,
-                    staticResultsTask.get(LONG_CHECK_TASK_TIMEOUT_MS, TimeUnit.MILLISECONDS));
-        } catch (TimeoutException | InterruptedException | ExecutionException e) {
-            Log.d(TAG, "Could not retrieve static results: " + e);
-            resultsArray.put(ResultLoaderId.STATIC_RESULTS, EMPTY_LIST);
-        }
-
-        try {
-            resultsArray.put(ResultLoaderId.INSTALLED_RESULTS,
-                    installedAppTask.get(SHORT_CHECK_TASK_TIMEOUT_MS, TimeUnit.MILLISECONDS));
-        } catch (TimeoutException | InterruptedException | ExecutionException e) {
-            Log.d(TAG, "Could not retrieve installed app results in time: " + e);
-
-            resultsArray.put(ResultLoaderId.INSTALLED_RESULTS, EMPTY_LIST);
-        }
-
-        long mergeStartTime = System.currentTimeMillis();
-        Log.i(TAG, "Total result loader time: " + (mergeStartTime - allTasksStart));
-        List<? extends SearchResult> mergedResults = mergeSearchResults(resultsArray);
-        Log.i(TAG, "Total merge time: " + (System.currentTimeMillis() - mergeStartTime));
-        Log.i(TAG, "Total aggregator time: " + (System.currentTimeMillis() - allTasksStart));
-
-        return mergedResults;
-    }
-
-    // TODO (b/68255021) scale the dynamic search results ranks and do a k-way merge
-    private List<? extends SearchResult> mergeSearchResults(
-            SparseArray<List<? extends SearchResult>> resultsArray) {
-        List<? extends SearchResult> staticResults = resultsArray.get(
-                ResultLoaderId.STATIC_RESULTS);
-        List<? extends SearchResult> installedAppResults = resultsArray.get(
-                ResultLoaderId.INSTALLED_RESULTS);
-        List<? extends SearchResult> accessibilityResults = resultsArray.get(
-                ResultLoaderId.ACCESSIBILITY_RESULTS);
-        List<? extends SearchResult> inputDeviceResults = resultsArray.get(
-                ResultLoaderId.INPUT_RESULTS);
-        List<SearchResult> searchResults;
-
-        int staticSize = staticResults.size();
-        int appSize = installedAppResults.size();
-        int a11ySize = accessibilityResults.size();
-        int inputDeviceSize = inputDeviceResults.size();
-        int appIndex = 0;
-        int a11yIndex = 0;
-        int inputDeviceIndex = 0;
-        int rank = SearchResult.TOP_RANK;
-
-        // TODO: We need a helper method to do k-way merge.
-        searchResults = new ArrayList<>(staticSize + appSize + a11ySize + inputDeviceSize);
-        searchResults.addAll(resultsArray.get(ResultLoaderId.STATIC_RESULTS));
-
-        while (rank <= SearchResult.BOTTOM_RANK) {
-            while ((appIndex < appSize) && (installedAppResults.get(appIndex).rank == rank)) {
-                searchResults.add(installedAppResults.get(appIndex++));
-            }
-            while ((a11yIndex < a11ySize) && (accessibilityResults.get(a11yIndex).rank == rank)) {
-                searchResults.add(accessibilityResults.get(a11yIndex++));
-            }
-            while (inputDeviceIndex < inputDeviceSize
-                    && inputDeviceResults.get(inputDeviceIndex).rank == rank) {
-                searchResults.add(inputDeviceResults.get(inputDeviceIndex++));
-            }
-            rank++;
-        }
-
-        while (appIndex < appSize) {
-            searchResults.add(installedAppResults.get(appIndex++));
-        }
-        while (a11yIndex < a11ySize) {
-            searchResults.add(accessibilityResults.get(a11yIndex++));
-        }
-        while (inputDeviceIndex < inputDeviceSize) {
-            searchResults.add(inputDeviceResults.get(inputDeviceIndex++));
-        }
-
-        return searchResults;
-    }
-}
diff --git a/src/com/android/settings/search/SearchResultDiffCallback.java b/src/com/android/settings/search/SearchResultDiffCallback.java
deleted file mode 100644
index 0f0b977..0000000
--- a/src/com/android/settings/search/SearchResultDiffCallback.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.support.v7.util.DiffUtil;
-
-import java.util.List;
-
-/**
- * Callback for DiffUtil to elegantly update search data when the query changes.
- */
-public class SearchResultDiffCallback extends DiffUtil.Callback {
-
-    private List<? extends SearchResult> mOldList;
-    private List<? extends SearchResult> mNewList;
-
-    public SearchResultDiffCallback(List<? extends SearchResult> oldList,
-            List<? extends SearchResult> newList) {
-        mOldList = oldList;
-        mNewList = newList;
-    }
-
-    @Override
-    public int getOldListSize() {
-        return mOldList.size();
-    }
-
-    @Override
-    public int getNewListSize() {
-        return mNewList.size();
-    }
-
-    @Override
-    public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
-        return mOldList.get(oldItemPosition).equals(mNewList.get(newItemPosition));
-    }
-
-    @Override
-    public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
-        return mOldList.get(oldItemPosition).equals(mNewList.get(newItemPosition));
-    }
-}
diff --git a/src/com/android/settings/search/SearchResultLoader.java b/src/com/android/settings/search/SearchResultLoader.java
deleted file mode 100644
index f4abd8e..0000000
--- a/src/com/android/settings/search/SearchResultLoader.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.android.settings.search;
-
-import com.android.settingslib.utils.AsyncLoader;
-
-import android.content.Context;
-
-import java.util.List;
-
-/**
- * Loads a sorted list of Search results for a given query.
- */
-public class SearchResultLoader extends AsyncLoader<List<? extends SearchResult>> {
-
-    private final String mQuery;
-
-    public SearchResultLoader(Context context, String query) {
-        super(context);
-        mQuery = query;
-    }
-
-    @Override
-    public List<? extends SearchResult> loadInBackground() {
-        SearchResultAggregator aggregator = SearchResultAggregator.getInstance();
-        return aggregator.fetchResults(getContext(), mQuery);
-    }
-
-    @Override
-    protected void onDiscardResult(List<? extends SearchResult> result) {
-    }
-}
diff --git a/src/com/android/settings/search/SearchResultsAdapter.java b/src/com/android/settings/search/SearchResultsAdapter.java
deleted file mode 100644
index c05ce18..0000000
--- a/src/com/android/settings/search/SearchResultsAdapter.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import android.content.Context;
-import android.support.v7.util.DiffUtil;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.android.settings.R;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class SearchResultsAdapter extends RecyclerView.Adapter<SearchViewHolder> {
-
-    private final SearchFragment mFragment;
-    private final List<SearchResult> mSearchResults;
-
-    public SearchResultsAdapter(SearchFragment fragment) {
-        mFragment = fragment;
-        mSearchResults = new ArrayList<>();
-
-        setHasStableIds(true);
-    }
-
-    @Override
-    public SearchViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        final Context context = parent.getContext();
-        final LayoutInflater inflater = LayoutInflater.from(context);
-        final View view;
-        switch (viewType) {
-            case ResultPayload.PayloadType.INTENT:
-                view = inflater.inflate(R.layout.search_intent_item, parent, false);
-                return new IntentSearchViewHolder(view);
-            case ResultPayload.PayloadType.INLINE_SWITCH:
-                // TODO (b/62807132) replace layout InlineSwitchViewHolder and return an
-                // InlineSwitchViewHolder.
-                view = inflater.inflate(R.layout.search_intent_item, parent, false);
-                return new IntentSearchViewHolder(view);
-            case ResultPayload.PayloadType.INLINE_LIST:
-                // TODO (b/62807132) build a inline-list view holder & layout.
-                view = inflater.inflate(R.layout.search_intent_item, parent, false);
-                return new IntentSearchViewHolder(view);
-            case ResultPayload.PayloadType.SAVED_QUERY:
-                view = inflater.inflate(R.layout.search_saved_query_item, parent, false);
-                return new SavedQueryViewHolder(view);
-            default:
-                return null;
-        }
-    }
-
-    @Override
-    public void onBindViewHolder(SearchViewHolder holder, int position) {
-        holder.onBind(mFragment, mSearchResults.get(position));
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return mSearchResults.get(position).stableId;
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        return mSearchResults.get(position).viewType;
-    }
-
-    @Override
-    public int getItemCount() {
-        return mSearchResults.size();
-    }
-
-    /**
-     * Displays recent searched queries.
-     */
-    public void displaySavedQuery(List<? extends SearchResult> data) {
-        clearResults();
-        mSearchResults.addAll(data);
-        notifyDataSetChanged();
-    }
-
-    public void clearResults() {
-        mSearchResults.clear();
-        notifyDataSetChanged();
-    }
-
-    public List<SearchResult> getSearchResults() {
-        return mSearchResults;
-    }
-
-    public void postSearchResults(List<? extends SearchResult> newSearchResults) {
-        final DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(
-                new SearchResultDiffCallback(mSearchResults, newSearchResults));
-        mSearchResults.clear();
-        mSearchResults.addAll(newSearchResults);
-        diffResult.dispatchUpdatesTo(this);
-        mFragment.onSearchResultsDisplayed(mSearchResults.size());
-    }
-}
diff --git a/src/com/android/settings/search/SearchViewHolder.java b/src/com/android/settings/search/SearchViewHolder.java
deleted file mode 100644
index 7667a06..0000000
--- a/src/com/android/settings/search/SearchViewHolder.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package com.android.settings.search;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.graphics.drawable.Drawable;
-import android.os.UserHandle;
-import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
-import android.util.IconDrawableFactory;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.support.annotation.VisibleForTesting;
-
-import com.android.settings.R;
-import com.android.settings.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.overlay.FeatureFactory;
-
-/**
- * The ViewHolder for the Search RecyclerView.
- * There are multiple search result types in the same Recycler view with different UI requirements.
- * Some examples include Intent results, Inline results, and Help articles.
- */
-public abstract class SearchViewHolder extends RecyclerView.ViewHolder {
-
-    private final String DYNAMIC_PLACEHOLDER = "%s";
-
-    private final String mPlaceholderSummary;
-
-    public final TextView titleView;
-    public final TextView summaryView;
-    public final TextView breadcrumbView;
-    public final ImageView iconView;
-
-    protected final MetricsFeatureProvider mMetricsFeatureProvider;
-    protected final SearchFeatureProvider mSearchFeatureProvider;
-    private final IconDrawableFactory mIconDrawableFactory;
-
-    public SearchViewHolder(View view) {
-        super(view);
-        final FeatureFactory featureFactory = FeatureFactory
-                .getFactory(view.getContext().getApplicationContext());
-        mMetricsFeatureProvider = featureFactory.getMetricsFeatureProvider();
-        mSearchFeatureProvider = featureFactory.getSearchFeatureProvider();
-        titleView = view.findViewById(android.R.id.title);
-        summaryView = view.findViewById(android.R.id.summary);
-        iconView = view.findViewById(android.R.id.icon);
-        breadcrumbView = view.findViewById(R.id.breadcrumb);
-
-        mPlaceholderSummary = view.getContext().getString(R.string.summary_placeholder);
-        mIconDrawableFactory = IconDrawableFactory.newInstance(view.getContext());
-    }
-
-    public abstract int getClickActionMetricName();
-
-    public void onBind(SearchFragment fragment, SearchResult result) {
-        titleView.setText(result.title);
-        // TODO (b/36101902) remove check for DYNAMIC_PLACEHOLDER
-        if (TextUtils.isEmpty(result.summary)
-                || TextUtils.equals(result.summary, mPlaceholderSummary)
-                || TextUtils.equals(result.summary, DYNAMIC_PLACEHOLDER)) {
-            summaryView.setVisibility(View.GONE);
-        } else {
-            summaryView.setText(result.summary);
-            summaryView.setVisibility(View.VISIBLE);
-        }
-
-        if (result instanceof AppSearchResult) {
-            AppSearchResult appResult = (AppSearchResult) result;
-            PackageManager pm = fragment.getActivity().getPackageManager();
-            UserHandle userHandle = appResult.getAppUserHandle();
-            Drawable badgedIcon = getBadgedIcon(appResult.info, userHandle.getIdentifier());
-            iconView.setImageDrawable(badgedIcon);
-            titleView.setContentDescription(
-                    pm.getUserBadgedLabel(appResult.info.loadLabel(pm), userHandle));
-        } else {
-            // Valid even when result.icon is null.
-            iconView.setImageDrawable(result.icon);
-        }
-
-        bindBreadcrumbView(result);
-    }
-
-    private void bindBreadcrumbView(SearchResult result) {
-        if (result.breadcrumbs == null || result.breadcrumbs.isEmpty()) {
-            breadcrumbView.setVisibility(View.GONE);
-            return;
-        }
-        final Context context = breadcrumbView.getContext();
-        String breadcrumb = result.breadcrumbs.get(0);
-        final int count = result.breadcrumbs.size();
-        for (int i = 1; i < count; i++) {
-            breadcrumb = context.getString(R.string.search_breadcrumb_connector,
-                    breadcrumb, result.breadcrumbs.get(i));
-        }
-        breadcrumbView.setText(breadcrumb);
-        breadcrumbView.setVisibility(View.VISIBLE);
-    }
-
-    @VisibleForTesting
-    Drawable getBadgedIcon(ApplicationInfo info, int userId) {
-        return mIconDrawableFactory.getBadgedIcon(info, userId);
-    }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/search/actionbar/SearchMenuController.java b/src/com/android/settings/search/actionbar/SearchMenuController.java
index 28bde33..f3a9285 100644
--- a/src/com/android/settings/search/actionbar/SearchMenuController.java
+++ b/src/com/android/settings/search/actionbar/SearchMenuController.java
@@ -18,7 +18,7 @@
 
 import android.annotation.NonNull;
 import android.app.Fragment;
-import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -38,14 +38,7 @@
     private final Fragment mHost;
 
     public static void init(@NonNull ObservablePreferenceFragment host) {
-        final Context context = host.getContext();
-        final boolean isSearchV2Enabled = FeatureFactory.getFactory(context)
-                .getSearchFeatureProvider()
-                .isSearchV2Enabled(context);
-
-        if (isSearchV2Enabled) {
-            host.getLifecycle().addObserver(new SearchMenuController(host));
-        }
+        host.getLifecycle().addObserver(new SearchMenuController(host));
     }
 
     private SearchMenuController(@NonNull Fragment host) {
@@ -67,8 +60,11 @@
         searchItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 
         searchItem.setOnMenuItemClickListener(target -> {
-            mHost.startActivityForResult(
-                    SearchFeatureProvider.SEARCH_UI_INTENT, 0 /* requestCode */);
+            final Intent intent = SearchFeatureProvider.SEARCH_UI_INTENT;
+            intent.setPackage(FeatureFactory.getFactory(mHost.getContext())
+                    .getSearchFeatureProvider().getSettingsIntelligencePkgName());
+
+            mHost.startActivityForResult(intent, 0 /* requestCode */);
             return true;
         });
     }
diff --git a/src/com/android/settings/search/ranking/SearchResultsRankerCallback.java b/src/com/android/settings/search/ranking/SearchResultsRankerCallback.java
deleted file mode 100644
index c254a40..0000000
--- a/src/com/android/settings/search/ranking/SearchResultsRankerCallback.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.search.ranking;
-
-import android.util.Pair;
-
-import java.util.List;
-
-public interface SearchResultsRankerCallback {
-
-    /**
-     * Called when ranker provides the ranking scores.
-     * @param searchRankingScores Ordered List of Pairs of String and Float corresponding to
-     *                            stableIds and ranking scores. The list must be descendingly
-     *                            ordered based on scores.
-     */
-    public void onRankingScoresAvailable(List<Pair<String, Float>> searchRankingScores);
-
-    /**
-     * Called when for any reason ranker fails, which notifies the client to proceed
-     * without ranking results.
-     */
-    public void onRankingFailed();
-}
diff --git a/src/com/android/settings/security/ChangeScreenLockPreferenceController.java b/src/com/android/settings/security/ChangeScreenLockPreferenceController.java
index 67b78fc..fdb9349 100644
--- a/src/com/android/settings/security/ChangeScreenLockPreferenceController.java
+++ b/src/com/android/settings/security/ChangeScreenLockPreferenceController.java
@@ -67,7 +67,7 @@
 
     @Override
     public boolean isAvailable() {
-        return true;
+        return mContext.getResources().getBoolean(R.bool.config_show_unlock_set_or_change);
     }
 
     @Override
diff --git a/src/com/android/settings/security/ScreenPinningPreferenceController.java b/src/com/android/settings/security/ScreenPinningPreferenceController.java
index 01ccbaa..305d076 100644
--- a/src/com/android/settings/security/ScreenPinningPreferenceController.java
+++ b/src/com/android/settings/security/ScreenPinningPreferenceController.java
@@ -33,7 +33,8 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return AVAILABLE;
+        return mContext.getResources().getBoolean(R.bool.config_show_screen_pinning_settings)
+                ? AVAILABLE : DISABLED_UNSUPPORTED;
     }
 
     @Override
diff --git a/src/com/android/settings/security/ShowPasswordPreferenceController.java b/src/com/android/settings/security/ShowPasswordPreferenceController.java
index d0216e8..82f1935 100644
--- a/src/com/android/settings/security/ShowPasswordPreferenceController.java
+++ b/src/com/android/settings/security/ShowPasswordPreferenceController.java
@@ -23,6 +23,7 @@
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.core.TogglePreferenceController;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.R;
 
 public class ShowPasswordPreferenceController extends TogglePreferenceController {
 
@@ -53,7 +54,9 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return AVAILABLE;
+        return mContext.getResources().getBoolean(R.bool.config_show_show_password)
+                ? AVAILABLE : DISABLED_UNSUPPORTED;
     }
+
 }
 
diff --git a/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java b/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java
index c615eff..5bb8f75 100644
--- a/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java
+++ b/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java
@@ -47,7 +47,8 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return AVAILABLE;
+        return mContext.getResources().getBoolean(R.bool.config_show_manage_trust_agents)
+                ? AVAILABLE : DISABLED_UNSUPPORTED;
     }
 
     @Override
diff --git a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
index 99aa6a4..0c591ed 100644
--- a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
+++ b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
@@ -31,6 +31,7 @@
 
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settings.security.SecurityFeatureProvider;
@@ -46,7 +47,8 @@
 import java.util.List;
 
 public class TrustAgentListPreferenceController extends AbstractPreferenceController
-        implements LifecycleObserver, OnSaveInstanceState, OnCreate, OnResume {
+        implements PreferenceControllerMixin, LifecycleObserver, OnSaveInstanceState,
+        OnCreate, OnResume {
 
     private static final String TRUST_AGENT_CLICK_INTENT = "trust_agent_click_intent";
     @VisibleForTesting
@@ -77,7 +79,7 @@
 
     @Override
     public boolean isAvailable() {
-        return true;
+        return mContext.getResources().getBoolean(R.bool.config_show_trust_agent_click_intent);
     }
 
     @Override
@@ -144,6 +146,10 @@
                 mSecurityCategory.removePreference(oldAgent);
             }
         }
+        // If for some reason the preference is no longer available, don't proceed to add.
+        if (!isAvailable()) {
+            return;
+        }
         // Then add new ones.
         final boolean hasSecurity = mLockPatternUtils.isSecure(MY_USER_ID);
         final List<TrustAgentManager.TrustAgentComponentInfo> agents =
diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java
index 4df4d50..e068b2f 100644
--- a/src/com/android/settings/slices/SettingsSliceProvider.java
+++ b/src/com/android/settings/slices/SettingsSliceProvider.java
@@ -25,13 +25,40 @@
 import android.net.Uri;
 import android.net.wifi.WifiManager;
 import android.support.annotation.VisibleForTesting;
+import android.util.Log;
 
 import com.android.settings.R;
+import com.android.settingslib.utils.ThreadUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.WeakHashMap;
 
 import androidx.app.slice.Slice;
 import androidx.app.slice.SliceProvider;
 import androidx.app.slice.builders.ListBuilder;
 
+/**
+ * A {@link SliceProvider} for Settings to enabled inline results in system apps.
+ *
+ * <p>{@link SettingsSliceProvider} accepts a {@link Uri} with {@link #SLICE_AUTHORITY} and a
+ * {@code String} key based on the setting intended to be changed. This provider builds a
+ * {@link Slice} and responds to Slice actions through the database defined by
+ * {@link SlicesDatabaseHelper}, whose data is written by {@link SlicesIndexer}.
+ *
+ * <p>When a {@link Slice} is requested, we start loading {@link SliceData} in the background and
+ * return an stub {@link Slice} with the correct {@link Uri} immediately. In the background, the
+ * data corresponding to the key in the {@link Uri} is read by {@link SlicesDatabaseAccessor}, and
+ * the entire row is converted into a {@link SliceData}. Once complete, it is stored in
+ * {@link #mSliceDataCache}, and then an update sent via the Slice framework to the Slice.
+ * The {@link Slice} displayed by the Slice-presenter will re-query this Slice-provider and find
+ * the {@link SliceData} cached to build the full {@link Slice}.
+ *
+ * <p>When an action is taken on that {@link Slice}, we receive the action in
+ * {@link SliceBroadcastReceiver}, and use the
+ * {@link com.android.settings.core.BasePreferenceController} indexed as
+ * {@link SlicesDatabaseHelper.IndexColumns#CONTROLLER} to manipulate the setting.
+ */
 public class SettingsSliceProvider extends SliceProvider {
 
     private static final String TAG = "SettingsSliceProvider";
@@ -52,6 +79,9 @@
     @VisibleForTesting
     SlicesDatabaseAccessor mSlicesDatabaseAccessor;
 
+    @VisibleForTesting
+    Map<Uri, SliceData> mSliceDataCache;
+
     public static Uri getUri(String path) {
         return new Uri.Builder()
                 .scheme(ContentResolver.SCHEME_CONTENT)
@@ -62,6 +92,7 @@
     @Override
     public boolean onCreateSliceProvider() {
         mSlicesDatabaseAccessor = new SlicesDatabaseAccessor(getContext());
+        mSliceDataCache = new WeakHashMap<>();
         return true;
     }
 
@@ -75,10 +106,41 @@
                 return createWifiSlice(sliceUri);
         }
 
-        return getHoldingSlice(sliceUri);
+        SliceData cachedSliceData = mSliceDataCache.get(sliceUri);
+        if (cachedSliceData == null) {
+            loadSliceInBackground(sliceUri);
+            return getSliceStub(sliceUri);
+        }
+
+        // Remove the SliceData from the cache after it has been used to prevent a memory-leak.
+        mSliceDataCache.remove(sliceUri);
+        return SliceBuilderUtils.buildSlice(getContext(), cachedSliceData);
     }
 
-    private Slice getHoldingSlice(Uri uri) {
+    @VisibleForTesting
+    void loadSlice(Uri uri) {
+        long startBuildTime = System.currentTimeMillis();
+
+        SliceData sliceData = mSlicesDatabaseAccessor.getSliceDataFromUri(uri);
+        mSliceDataCache.put(uri, sliceData);
+        getContext().getContentResolver().notifyChange(uri, null /* content observer */);
+
+        Log.d(TAG, "Built slice (" + uri + ") in: " +
+                (System.currentTimeMillis() - startBuildTime));
+    }
+
+    @VisibleForTesting
+    void loadSliceInBackground(Uri uri) {
+        ThreadUtils.postOnBackgroundThread(() -> {
+            loadSlice(uri);
+        });
+    }
+
+    /**
+     * @return an empty {@link Slice} with {@param uri} to be used as a stub while the real
+     * {@link SliceData} is loaded from {@link SlicesDatabaseHelper.Tables#TABLE_SLICES_INDEX}.
+     */
+    private Slice getSliceStub(Uri uri) {
         return new ListBuilder(getContext(), uri).build();
     }
 
diff --git a/src/com/android/settings/utils/ManagedServiceSettings.java b/src/com/android/settings/utils/ManagedServiceSettings.java
index d222345..e89757c 100644
--- a/src/com/android/settings/utils/ManagedServiceSettings.java
+++ b/src/com/android/settings/utils/ManagedServiceSettings.java
@@ -143,8 +143,10 @@
                 final boolean enable = (boolean) newValue;
                 return setEnabled(cn, summary, enable);
             });
+            pref.setKey(cn.flattenToString());
             screen.addPreference(pref);
         }
+        highlightPreferenceIfNeeded();
     }
 
     private int getCurrentUser(int managedProfileId) {
diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java
index 0d07e67..9b2c529 100644
--- a/src/com/android/settings/widget/EntityHeaderController.java
+++ b/src/com/android/settings/widget/EntityHeaderController.java
@@ -16,6 +16,10 @@
 
 package com.android.settings.widget;
 
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
+        .ACTION_OPEN_APP_NOTIFICATION_SETTING;
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_OPEN_APP_SETTING;
+
 import android.annotation.IdRes;
 import android.annotation.UserIdInt;
 import android.app.ActionBar;
@@ -27,6 +31,7 @@
 import android.content.pm.ResolveInfo;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
+import android.os.Bundle;
 import android.os.UserHandle;
 import android.support.annotation.IntDef;
 import android.support.annotation.VisibleForTesting;
@@ -54,10 +59,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
-        .ACTION_OPEN_APP_NOTIFICATION_SETTING;
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_OPEN_APP_SETTING;
-
 public class EntityHeaderController {
 
     @IntDef({ActionType.ACTION_NONE,
@@ -291,6 +292,11 @@
         return;
     }
 
+    /**
+     * Styles the action bar (elevation, scrolling behaviors, color, etc).
+     * <p/>
+     * This method must be called after {@link Fragment#onCreate(Bundle)}.
+     */
     public EntityHeaderController styleActionBar(Activity activity) {
         if (activity == null) {
             Log.w(TAG, "No activity, cannot style actionbar.");
diff --git a/src/com/android/settings/widget/LinearColorBar.java b/src/com/android/settings/widget/LinearColorBar.java
new file mode 100644
index 0000000..b3e685e
--- /dev/null
+++ b/src/com/android/settings/widget/LinearColorBar.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.widget;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.widget.LinearLayout;
+
+import com.android.settings.Utils;
+
+public class LinearColorBar extends LinearLayout {
+
+    static final int RIGHT_COLOR = 0xffced7db;
+    static final int GRAY_COLOR = 0xff555555;
+    static final int WHITE_COLOR = 0xffffffff;
+
+    private float mRedRatio;
+    private float mYellowRatio;
+    private float mGreenRatio;
+
+    private int mLeftColor;
+    private int mMiddleColor;
+    private int mRightColor = RIGHT_COLOR;
+
+    private int mColoredRegions = REGION_RED | REGION_YELLOW | REGION_GREEN;
+
+    final Rect mRect = new Rect();
+    final Paint mPaint = new Paint();
+
+    int mLineWidth;
+
+    int mLastRegion;
+
+    final Paint mColorGradientPaint = new Paint();
+    final Paint mEdgeGradientPaint = new Paint();
+
+    public static final int REGION_RED = 1 << 0;
+    public static final int REGION_YELLOW = 1 << 1;
+    public static final int REGION_GREEN = 1 << 2;
+
+    public LinearColorBar(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setWillNotDraw(false);
+        mPaint.setStyle(Paint.Style.FILL);
+        mColorGradientPaint.setStyle(Paint.Style.FILL);
+        mColorGradientPaint.setAntiAlias(true);
+        mEdgeGradientPaint.setStyle(Paint.Style.STROKE);
+        mLineWidth = getResources().getDisplayMetrics().densityDpi >= DisplayMetrics.DENSITY_HIGH
+                ? 2 : 1;
+        mEdgeGradientPaint.setStrokeWidth(mLineWidth);
+        mEdgeGradientPaint.setAntiAlias(true);
+        mLeftColor = mMiddleColor = Utils.getColorAccent(context);
+    }
+
+    public void setRatios(float red, float yellow, float green) {
+        mRedRatio = red;
+        mYellowRatio = yellow;
+        mGreenRatio = green;
+        invalidate();
+    }
+
+    public void setColors(int red, int yellow, int green) {
+        mLeftColor = red;
+        mMiddleColor = yellow;
+        mRightColor = green;
+        updateIndicator();
+        invalidate();
+    }
+
+    private void updateIndicator() {
+        int off = getPaddingTop() - getPaddingBottom();
+        if (off < 0) off = 0;
+        mRect.top = off;
+        mRect.bottom = getHeight();
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+        updateIndicator();
+    }
+
+    @Override
+    protected void dispatchSetPressed(boolean pressed) {
+        invalidate();
+    }
+
+    private int pickColor(int color, int region) {
+        if (isPressed() && (mLastRegion & region) != 0) {
+            return WHITE_COLOR;
+        }
+        if ((mColoredRegions & region) == 0) {
+            return GRAY_COLOR;
+        }
+        return color;
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+
+        final int width = getWidth();
+
+        if (!isLayoutRtl()) {
+            drawLtr(canvas, width);
+        } else {
+            drawRtl(canvas, width);
+        }
+    }
+
+    private void drawLtr(Canvas canvas, int width) {
+        int start = 0;
+        int end = start + (int) (width * mRedRatio);
+        int end2 = end + (int) (width * mYellowRatio);
+
+        if (start < end) {
+            mRect.left = start;
+            mRect.right = end;
+            mPaint.setColor(pickColor(mLeftColor, REGION_RED));
+            canvas.drawRect(mRect, mPaint);
+            start = end;
+        }
+
+        end = end2;
+
+        if (start < end) {
+            mRect.left = start;
+            mRect.right = end;
+            mPaint.setColor(pickColor(mMiddleColor, REGION_YELLOW));
+            canvas.drawRect(mRect, mPaint);
+            start = end;
+        }
+
+        end = width;
+        if (start < end) {
+            mRect.left = start;
+            mRect.right = end;
+            mPaint.setColor(pickColor(mRightColor, REGION_GREEN));
+            canvas.drawRect(mRect, mPaint);
+        }
+    }
+
+    private void drawRtl(Canvas canvas, int width) {
+        int start = width;
+        int end = start - (int) (width * mRedRatio);
+        int end2 = end - (int) (width * mYellowRatio);
+
+        if (start > end) {
+            mRect.left = end;
+            mRect.right = start;
+            mPaint.setColor(pickColor(mLeftColor, REGION_RED));
+            canvas.drawRect(mRect, mPaint);
+            start = end;
+        }
+
+        end = end2;
+
+        if (start > end) {
+            mRect.left = end;
+            mRect.right = start;
+            mPaint.setColor(pickColor(mMiddleColor, REGION_YELLOW));
+            canvas.drawRect(mRect, mPaint);
+            start = end;
+        }
+
+        end = 0;
+        if (start > end) {
+            mRect.left = end;
+            mRect.right = start;
+            mPaint.setColor(pickColor(mRightColor, REGION_GREEN));
+            canvas.drawRect(mRect, mPaint);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 95944f2..83d9c18 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -33,6 +33,7 @@
 import android.net.wifi.WpsInfo;
 import android.nfc.NfcAdapter;
 import android.os.Bundle;
+import android.os.Handler;
 import android.os.PowerManager;
 import android.provider.Settings;
 import android.support.annotation.VisibleForTesting;
@@ -687,8 +688,13 @@
     private void updateAccessPointsDelayed() {
         // Safeguard from some delayed event handling
         if (getActivity() != null && !mIsRestricted && mWifiManager.isWifiEnabled()) {
+            final View view = getView();
+            final Handler handler = view.getHandler();
+            if (handler != null && handler.hasCallbacks(mUpdateAccessPointsRunnable)) {
+                return;
+            }
             setProgressBarVisible(true);
-            getView().postDelayed(mUpdateAccessPointsRunnable, 300 /* delay milliseconds */);
+            view.postDelayed(mUpdateAccessPointsRunnable, 300 /* delay milliseconds */);
         }
     }
 
diff --git a/tests/robotests/assets/grandfather_not_implementing_indexable b/tests/robotests/assets/grandfather_not_implementing_indexable
index a82c9ef..eb06125 100644
--- a/tests/robotests/assets/grandfather_not_implementing_indexable
+++ b/tests/robotests/assets/grandfather_not_implementing_indexable
@@ -72,4 +72,5 @@
 com.android.settings.TetherSettings
 com.android.settings.ApnEditor
 com.android.settings.UserCredentialsSettings
-com.android.settings.TestingSettings
\ No newline at end of file
+com.android.settings.TestingSettings
+com.android.settings.applications.StorageAccessDetails
\ No newline at end of file
diff --git a/tests/robotests/res/values-mcc999/config.xml b/tests/robotests/res/values-mcc999/config.xml
index c3ae911..a3205f3 100644
--- a/tests/robotests/res/values-mcc999/config.xml
+++ b/tests/robotests/res/values-mcc999/config.xml
@@ -21,6 +21,7 @@
     <bool name="config_show_connectivity_monitor">false</bool>
     <bool name="config_display_recent_apps">false</bool>
     <bool name="config_show_wifi_settings">false</bool>
+    <bool name="config_show_toggle_airplane">false</bool>
     <bool name="config_show_high_power_apps">false</bool>
     <bool name="config_show_alarm_volume">false</bool>
     <bool name="config_show_charging_sounds">false</bool>
@@ -35,6 +36,12 @@
     <bool name="config_show_enabled_vr_listeners">false</bool>
     <bool name="config_location_mode_available">false</bool>
     <bool name="config_show_location_scanning">false</bool>
+    <bool name="config_show_manage_device_admin">false</bool>
+    <bool name="config_show_unlock_set_or_change">false</bool>
+    <bool name="config_show_screen_pinning_settings">false</bool>
+    <bool name="config_show_manage_trust_agents">false</bool>
+    <bool name="config_show_show_password">false</bool>
+    <bool name="config_show_trust_agent_click_intent">false</bool>
     <bool name="config_show_wallpaper_attribution">false</bool>
     <bool name="config_show_default_home">false</bool>
     <bool name="config_show_accessibility_shortcut_preference">false</bool>
diff --git a/tests/robotests/src/android/content/om/IOverlayManager.java b/tests/robotests/src/android/content/om/IOverlayManager.java
index d4f6d10..cc1d0ef 100644
--- a/tests/robotests/src/android/content/om/IOverlayManager.java
+++ b/tests/robotests/src/android/content/om/IOverlayManager.java
@@ -16,7 +16,11 @@
 
 import android.os.IBinder;
 
-public class IOverlayManager {
+public interface IOverlayManager {
+
+    public OverlayInfo getOverlayInfo(String packageName, int userId);
+
+    public boolean setEnabled(java.lang.String packageName, boolean enable, int userId);
 
     public static class Stub {
         public static IOverlayManager asInterface(IBinder b) {
diff --git a/tests/robotests/src/android/content/om/OverlayInfo.java b/tests/robotests/src/android/content/om/OverlayInfo.java
index cfd3adc..98ce091 100644
--- a/tests/robotests/src/android/content/om/OverlayInfo.java
+++ b/tests/robotests/src/android/content/om/OverlayInfo.java
@@ -15,4 +15,9 @@
 package android.content.om;
 
 public class OverlayInfo {
-}
+
+    public boolean isEnabled() {
+        return false;
+    }
+
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java
index 1f701c2..81a6bb31 100644
--- a/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java
@@ -102,6 +102,33 @@
         assertThat(count).named("List items shown").isEqualTo(3);
     }
 
+    @Test
+    public void skipButton_shouldBeVisible_duringNonFingerprintFlow() {
+        Button button = mActivity.findViewById(R.id.footerLeftButton);
+        assertThat(button).isNotNull();
+        assertThat(button.getVisibility()).isEqualTo(View.VISIBLE);
+
+        button.performClick();
+        AlertDialog chooserDialog = ShadowAlertDialog.getLatestAlertDialog();
+        assertThat(chooserDialog).isNotNull();
+    }
+
+    @Test
+    public void skipButton_shouldNotBeVisible_duringFingerprintFlow() {
+        mActivity = Robolectric.buildActivity(
+                SetupChooseLockPattern.class,
+                SetupChooseLockPattern.modifyIntentForSetup(
+                        application,
+                        new IntentBuilder(application)
+                                .setUserId(UserHandle.myUserId())
+                                .setForFingerprint(true)
+                                .build()))
+                .setup().get();
+        Button button = mActivity.findViewById(R.id.footerLeftButton);
+        assertThat(button).isNotNull();
+        assertThat(button.getVisibility()).isEqualTo(View.GONE);
+    }
+
     private ChooseLockPatternFragment findFragment(Activity activity) {
         return (ChooseLockPatternFragment)
                 activity.getFragmentManager().findFragmentById(R.id.main_content);
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 286469c..ee870b7 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java
@@ -16,15 +16,25 @@
 
 package com.android.settings.applications.appinfo;
 
+import static android.arch.lifecycle.Lifecycle.Event.ON_START;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
+import android.app.ActionBar;
 import android.app.Activity;
+import android.arch.lifecycle.LifecycleOwner;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
+import android.graphics.drawable.Drawable;
 import android.support.v7.preference.PreferenceScreen;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
 
@@ -33,12 +43,14 @@
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
@@ -48,19 +60,34 @@
 
     @Mock
     private AppInfoDashboardFragment mFragment;
+
     @Mock
-    private Activity mActivity;
+    private PreferenceScreen mScreen;
+    @Mock
+    private LayoutPreference mPreference;
 
     private Context mContext;
+    private Activity mActivity;
+    private LifecycleOwner mLifecycleOwner;
+    private Lifecycle mLifecycle;
+    private View mHeader;
     private AppHeaderViewPreferenceController mController;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
+        mActivity = spy(Robolectric.buildActivity(Activity.class).get());
+        mLifecycleOwner = () -> mLifecycle;
+        mLifecycle = new Lifecycle(mLifecycleOwner);
+        mHeader = LayoutInflater.from(mContext).inflate(R.layout.settings_entity_header, null);
+
         when(mFragment.getActivity()).thenReturn(mActivity);
-        when(mActivity.getApplicationContext()).thenReturn(mContext);
-        mController = new AppHeaderViewPreferenceController(mContext, mFragment, "Package1", null);
+        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
+        when(mPreference.findViewById(R.id.entity_header)).thenReturn(mHeader);
+
+        mController = new AppHeaderViewPreferenceController(mContext, mFragment, "Package1",
+                mLifecycle);
     }
 
     @Test
@@ -77,21 +104,29 @@
         when(mFragment.getAppEntry()).thenReturn(appEntry);
         when(mFragment.getPackageInfo()).thenReturn(packageInfo);
 
-        final PreferenceScreen screen = mock(PreferenceScreen.class);
-        final LayoutPreference preference = mock(LayoutPreference.class);
-        when(screen.findPreference(mController.getPreferenceKey())).thenReturn(preference);
-        final View header = mock(View.class);
-        when(preference.findViewById(R.id.entity_header)).thenReturn(header);
-        final TextView title = mock(TextView.class);
-        when(header.findViewById(R.id.entity_header_title)).thenReturn(title);
-        final TextView summary = mock(TextView.class);
-        when(header.findViewById(R.id.entity_header_summary)).thenReturn(summary);
-        mController.displayPreference(screen);
 
+        final TextView title = mHeader.findViewById(R.id.entity_header_title);
+        final TextView summary = mHeader.findViewById(R.id.entity_header_summary);
+
+        mController.displayPreference(mScreen);
         mController.refreshUi();
 
-        verify(title).setText(appLabel);
-        verify(summary).setText(mContext.getString(R.string.installed));
+        assertThat(title.getText()).isEqualTo(appLabel);
+        assertThat(summary.getText()).isEqualTo(mContext.getString(R.string.installed));
+    }
+
+    @Test
+    public void onStart_shouldStyleActionBar() {
+        final ActionBar actionBar = mock(ActionBar.class);
+        when(mActivity.getActionBar()).thenReturn(actionBar);
+
+        mController.displayPreference(mScreen);
+
+        verifyZeroInteractions(actionBar);
+
+        mLifecycle.handleLifecycleEvent(ON_START);
+
+        verify(actionBar).setBackgroundDrawable(any(Drawable.class));
     }
 
 }
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
index 823bcbe..4294dfb 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
@@ -95,8 +95,6 @@
 
         final Preference preference = mBluetoothDeviceUpdater.mPreferenceMap.get(mBluetoothDevice);
         assertThat(preference).isNotNull();
-        assertThat(preference.getSummary()).isEqualTo(
-                mContext.getString(R.string.summary_placeholder));
         verify(mDevicePreferenceCallback).onDeviceAdded(preference);
     }
 
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterV2Test.java b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterV2Test.java
new file mode 100644
index 0000000..801a8e4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterV2Test.java
@@ -0,0 +1,263 @@
+/*
+ * 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.dashboard;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Icon;
+import android.service.settings.suggestions.Suggestion;
+import android.support.v7.widget.RecyclerView;
+import android.util.DisplayMetrics;
+import android.view.View;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.conditional.Condition;
+import com.android.settings.dashboard.suggestions.SuggestionAdapterV2;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settingslib.drawer.DashboardCategory;
+import com.android.settingslib.drawer.Tile;
+
+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 java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                SettingsShadowResources.class,
+                SettingsShadowResources.SettingsShadowTheme.class,
+        })
+public class DashboardAdapterV2Test {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private SettingsActivity mContext;
+    @Mock
+    private View mView;
+    @Mock
+    private Condition mCondition;
+    @Mock
+    private Resources mResources;
+    private FakeFeatureFactory mFactory;
+    private DashboardAdapterV2 mDashboardAdapter;
+    private List<Condition> mConditionList;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mFactory = FakeFeatureFactory.setupForTest();
+        when(mFactory.dashboardFeatureProvider.shouldTintIcon()).thenReturn(true);
+
+        when(mContext.getResources()).thenReturn(mResources);
+        when(mResources.getQuantityString(any(int.class), any(int.class), any()))
+                .thenReturn("");
+
+        mConditionList = new ArrayList<>();
+        mConditionList.add(mCondition);
+        when(mCondition.shouldShow()).thenReturn(true);
+        mDashboardAdapter = new DashboardAdapterV2(mContext, null /* savedInstanceState */,
+            mConditionList, null /* suggestionControllerMixin */, null /* lifecycle */);
+        when(mView.getTag()).thenReturn(mCondition);
+    }
+
+    @Test
+    public void testSuggestionDismissed_notOnlySuggestion_updateSuggestionOnly() {
+        final DashboardAdapterV2 adapter =
+                spy(new DashboardAdapterV2(mContext, null /* savedInstanceState */,
+            null /* conditions */, null /* suggestionControllerMixin */, null /* lifecycle */));
+        final List<Suggestion> suggestions = makeSuggestionsV2("pkg1", "pkg2", "pkg3");
+        adapter.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);
+        when(itemView.findViewById(android.R.id.summary)).thenReturn(mock(TextView.class));
+        final DashboardAdapterV2.SuggestionContainerHolder holder =
+                new DashboardAdapterV2.SuggestionContainerHolder(itemView);
+
+        adapter.onBindSuggestion(holder, 0);
+
+        final DashboardDataV2 dashboardData = adapter.mDashboardData;
+        reset(adapter); // clear interactions tracking
+
+        final Suggestion suggestionToRemove = suggestions.get(1);
+        adapter.onSuggestionClosed(suggestionToRemove);
+
+        assertThat(adapter.mDashboardData).isEqualTo(dashboardData);
+        assertThat(suggestions.size()).isEqualTo(2);
+        assertThat(suggestions.contains(suggestionToRemove)).isFalse();
+        verify(adapter, never()).notifyDashboardDataChanged(any());
+    }
+
+    @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));
+        final DashboardAdapterV2.SuggestionContainerHolder holder =
+                new DashboardAdapterV2.SuggestionContainerHolder(itemView);
+        final List<Suggestion> suggestions = makeSuggestionsV2("pkg1", "pkg2", "pkg3", "pkg4");
+        final DashboardAdapterV2 adapter = spy(new DashboardAdapterV2(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() {
+        DashboardAdapterV2 adapter =
+                spy(new DashboardAdapterV2(mContext, null /* savedInstanceState */,
+            null /* conditions */, null /* suggestionControllerMixin */, null /* lifecycle */));
+        final List<Suggestion> suggestions = makeSuggestionsV2("pkg1");
+        adapter.setSuggestions(suggestions);
+        final DashboardDataV2 dashboardData = adapter.mDashboardData;
+        reset(adapter); // clear interactions tracking
+
+        adapter.onSuggestionClosed(suggestions.get(0));
+
+        assertThat(adapter.mDashboardData).isNotEqualTo(dashboardData);
+        verify(adapter).notifyDashboardDataChanged(any());
+    }
+
+    @Test
+    public void testSetCategories_iconTinted() {
+        TypedArray mockTypedArray = mock(TypedArray.class);
+        doReturn(mockTypedArray).when(mContext).obtainStyledAttributes(any(int[].class));
+        doReturn(0x89000000).when(mockTypedArray).getColor(anyInt(), anyInt());
+
+        final DashboardCategory category = new DashboardCategory();
+        final Icon mockIcon = mock(Icon.class);
+        final Tile tile = new Tile();
+        tile.isIconTintable = true;
+        tile.icon = mockIcon;
+        category.addTile(tile);
+
+        mDashboardAdapter.setCategory(category);
+
+        verify(mockIcon).setTint(eq(0x89000000));
+    }
+
+    @Test
+    public void testBindSuggestion_shouldSetSuggestionAdapterAndNoCrash() {
+        mDashboardAdapter = new DashboardAdapterV2(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);
+        when(itemView.findViewById(android.R.id.summary)).thenReturn(mock(TextView.class));
+        final DashboardAdapterV2.SuggestionContainerHolder holder =
+                new DashboardAdapterV2.SuggestionContainerHolder(itemView);
+
+        mDashboardAdapter.onBindSuggestion(holder, 0);
+
+        verify(data).setAdapter(any(SuggestionAdapterV2.class));
+        // should not crash
+    }
+
+    @Test
+    public void testBindSuggestion_shouldSetSummary() {
+        mDashboardAdapter = new DashboardAdapterV2(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);
+        final DashboardAdapterV2.SuggestionContainerHolder holder =
+            new DashboardAdapterV2.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");
+    }
+
+    private List<Suggestion> makeSuggestionsV2(String... pkgNames) {
+        final List<Suggestion> suggestions = new ArrayList<>();
+        for (String pkgName : pkgNames) {
+            final Suggestion suggestion = new Suggestion.Builder(pkgName)
+                    .setPendingIntent(mock(PendingIntent.class))
+                    .build();
+            suggestions.add(suggestion);
+        }
+        return suggestions;
+    }
+
+    private void setupSuggestions(List<Suggestion> suggestions) {
+        final Context context = RuntimeEnvironment.application;
+        mDashboardAdapter.setSuggestions(suggestions);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterV2Test.java b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterV2Test.java
new file mode 100644
index 0000000..5e0ecec
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterV2Test.java
@@ -0,0 +1,135 @@
+/*
+ * 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.dashboard.conditional;
+
+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.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.DashboardAdapterV2;
+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;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ConditionAdapterV2Test {
+    @Mock
+    private Condition mCondition1;
+    @Mock
+    private Condition mCondition2;
+
+    private Context mContext;
+    private ConditionAdapterV2 mConditionAdapter;
+    private List<Condition> mOneCondition;
+    private List<Condition> mTwoConditions;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        final CharSequence[] actions = new CharSequence[2];
+        when(mCondition1.getActions()).thenReturn(actions);
+        when(mCondition1.shouldShow()).thenReturn(true);
+        mOneCondition = new ArrayList<>();
+        mOneCondition.add(mCondition1);
+        mTwoConditions = new ArrayList<>();
+        mTwoConditions.add(mCondition1);
+        mTwoConditions.add(mCondition2);
+    }
+
+    @Test
+    public void getItemCount_notExpanded_shouldReturn0() {
+        mConditionAdapter = new ConditionAdapterV2(mContext, mOneCondition, false);
+        assertThat(mConditionAdapter.getItemCount()).isEqualTo(0);
+    }
+
+    @Test
+    public void getItemCount_expanded_shouldReturnListSize() {
+        mConditionAdapter = new ConditionAdapterV2(mContext, mOneCondition, true);
+        assertThat(mConditionAdapter.getItemCount()).isEqualTo(1);
+
+        mConditionAdapter = new ConditionAdapterV2(mContext, mTwoConditions, true);
+        assertThat(mConditionAdapter.getItemCount()).isEqualTo(2);
+    }
+
+    @Test
+    public void getItemViewType_shouldReturnConditionTile() {
+        mConditionAdapter = new ConditionAdapterV2(mContext, mTwoConditions, true);
+        assertThat(mConditionAdapter.getItemViewType(0)).isEqualTo(R.layout.condition_tile);
+    }
+
+    @Test
+    public void onBindViewHolder_shouldSetListener() {
+        final View view = LayoutInflater.from(mContext).inflate(
+            R.layout.condition_tile, new LinearLayout(mContext), true);
+        final DashboardAdapterV2.DashboardItemHolder viewHolder =
+            new DashboardAdapterV2.DashboardItemHolder(view);
+        mConditionAdapter = new ConditionAdapterV2(mContext, mOneCondition, true);
+
+        mConditionAdapter.onBindViewHolder(viewHolder, 0);
+        final View card = view.findViewById(R.id.content);
+        assertThat(card.hasOnClickListeners()).isTrue();
+    }
+
+    @Test
+    public void viewClick_shouldInvokeConditionPrimaryClick() {
+        final View view = LayoutInflater.from(mContext).inflate(
+            R.layout.condition_tile, new LinearLayout(mContext), true);
+        final DashboardAdapterV2.DashboardItemHolder viewHolder =
+            new DashboardAdapterV2.DashboardItemHolder(view);
+        mConditionAdapter = new ConditionAdapterV2(mContext, mOneCondition, true);
+
+        mConditionAdapter.onBindViewHolder(viewHolder, 0);
+        final View card = view.findViewById(R.id.content);
+        card.performClick();
+        verify(mCondition1).onPrimaryClick();
+    }
+
+    @Test
+    public void onSwiped_nullCondition_shouldNotCrash() {
+        final RecyclerView recyclerView = new RecyclerView(mContext);
+        final View view = LayoutInflater.from(mContext).inflate(
+                R.layout.condition_tile, new LinearLayout(mContext), true);
+        final DashboardAdapterV2.DashboardItemHolder viewHolder =
+                new DashboardAdapterV2.DashboardItemHolder(view);
+        mConditionAdapter = new ConditionAdapterV2(mContext, mOneCondition, true);
+        mConditionAdapter.addDismissHandling(recyclerView);
+
+        // do not bind viewholder to simulate the null condition scenario
+        mConditionAdapter.mSwipeCallback.onSwiped(viewHolder, 0);
+        // no crash
+    }
+
+}
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 26940d6..2ecab8d 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
@@ -36,7 +36,6 @@
 import com.android.settings.dashboard.DashboardAdapter;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.drawer.Tile;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -62,10 +61,8 @@
     private Context mContext;
     private SuggestionAdapter mSuggestionAdapter;
     private DashboardAdapter.DashboardItemHolder mSuggestionHolder;
-    private List<Tile> mOneSuggestion;
-    private List<Tile> mTwoSuggestions;
-    private List<Suggestion> mOneSuggestionV2;
-    private List<Suggestion> mTwoSuggestionsV2;
+    private List<Suggestion> mOneSuggestion;
+    private List<Suggestion> mTwoSuggestions;
 
     @Before
     public void setUp() {
@@ -73,45 +70,34 @@
         mContext = RuntimeEnvironment.application;
         mFeatureFactory = FakeFeatureFactory.setupForTest();
 
-        final Tile suggestion1 = new Tile();
-        final Tile suggestion2 = new Tile();
-        final Suggestion suggestion1V2 = new Suggestion.Builder("id1")
+        final Suggestion suggestion1 = new Suggestion.Builder("id1")
                 .setTitle("Test suggestion 1")
                 .build();
-        final Suggestion suggestion2V2 = new Suggestion.Builder("id2")
+        final Suggestion suggestion2 = new Suggestion.Builder("id2")
                 .setTitle("Test suggestion 2")
                 .build();
-        suggestion1.title = "Test Suggestion 1";
-        suggestion1.icon = mock(Icon.class);
-        suggestion2.title = "Test Suggestion 2";
-        suggestion2.icon = mock(Icon.class);
         mOneSuggestion = new ArrayList<>();
         mOneSuggestion.add(suggestion1);
         mTwoSuggestions = new ArrayList<>();
         mTwoSuggestions.add(suggestion1);
         mTwoSuggestions.add(suggestion2);
-        mOneSuggestionV2 = new ArrayList<>();
-        mOneSuggestionV2.add(suggestion1V2);
-        mTwoSuggestionsV2 = new ArrayList<>();
-        mTwoSuggestionsV2.add(suggestion1V2);
-        mTwoSuggestionsV2.add(suggestion2V2);
     }
 
     @Test
     public void getItemCount_shouldReturnListSize() {
         mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
-                mOneSuggestionV2, new ArrayList<>());
+                mOneSuggestion, new ArrayList<>());
         assertThat(mSuggestionAdapter.getItemCount()).isEqualTo(1);
 
         mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
-                mTwoSuggestionsV2, new ArrayList<>());
+                mTwoSuggestions, new ArrayList<>());
         assertThat(mSuggestionAdapter.getItemCount()).isEqualTo(2);
     }
 
     @Test
     public void getItemViewType_shouldReturnSuggestionTile() {
         mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
-                mOneSuggestionV2, new ArrayList<>());
+                mOneSuggestion, new ArrayList<>());
         assertThat(mSuggestionAdapter.getItemViewType(0))
                 .isEqualTo(R.layout.suggestion_tile);
     }
@@ -137,7 +123,7 @@
                 R.layout.suggestion_tile, new LinearLayout(mContext), true));
         mSuggestionHolder = new DashboardAdapter.DashboardItemHolder(view);
         mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
-                mOneSuggestionV2, new ArrayList<>());
+                mOneSuggestion, new ArrayList<>());
 
         // Bind twice
         mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
@@ -146,13 +132,13 @@
         // Log once
         verify(mFeatureFactory.metricsFeatureProvider).action(
                 mContext, MetricsProto.MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
-                mOneSuggestionV2.get(0).getId());
+                mOneSuggestion.get(0).getId());
     }
 
     @Test
     public void onBindViewHolder_itemViewShouldHandleClick()
             throws PendingIntent.CanceledException {
-        final List<Suggestion> suggestions = makeSuggestionsV2("pkg1");
+        final List<Suggestion> suggestions = makeSuggestions("pkg1");
         setupSuggestions(mActivity, suggestions);
 
         mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
@@ -164,21 +150,21 @@
 
     @Test
     public void getSuggestions_shouldReturnSuggestionWhenMatch() {
-        final List<Suggestion> suggestionsV2 = makeSuggestionsV2("pkg1");
-        setupSuggestions(mActivity, suggestionsV2);
+        final List<Suggestion> suggestions = makeSuggestions("pkg1");
+        setupSuggestions(mActivity, suggestions);
 
         assertThat(mSuggestionAdapter.getSuggestion(0)).isNotNull();
     }
 
-    private void setupSuggestions(Context context, List<Suggestion> suggestionsV2) {
+    private void setupSuggestions(Context context, List<Suggestion> suggestions) {
         mSuggestionAdapter = new SuggestionAdapter(context, mSuggestionControllerMixin,
-                suggestionsV2, new ArrayList<>());
+                suggestions, new ArrayList<>());
         mSuggestionHolder = mSuggestionAdapter.onCreateViewHolder(
                 new FrameLayout(RuntimeEnvironment.application),
                 mSuggestionAdapter.getItemViewType(0));
     }
 
-    private List<Suggestion> makeSuggestionsV2(String... pkgNames) {
+    private List<Suggestion> makeSuggestions(String... pkgNames) {
         final List<Suggestion> suggestions = new ArrayList<>();
         for (String pkgName : pkgNames) {
             final Suggestion suggestion = new Suggestion.Builder(pkgName)
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterV2Test.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterV2Test.java
new file mode 100644
index 0000000..2297f07
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterV2Test.java
@@ -0,0 +1,224 @@
+/*
+ * 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.dashboard.suggestions;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.app.PendingIntent;
+import android.content.Context;
+import android.service.settings.suggestions.Suggestion;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.DashboardAdapterV2;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SuggestionAdapterV2Test {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private SettingsActivity mActivity;
+    @Mock
+    private SuggestionControllerMixin mSuggestionControllerMixin;
+    private FakeFeatureFactory mFeatureFactory;
+    private Context mContext;
+    private SuggestionAdapterV2 mSuggestionAdapter;
+    private DashboardAdapterV2.DashboardItemHolder mSuggestionHolder;
+    private List<Suggestion> mOneSuggestion;
+    private List<Suggestion> mTwoSuggestions;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mFeatureFactory = FakeFeatureFactory.setupForTest();
+
+        final Suggestion suggestion1 = new Suggestion.Builder("id1")
+                .setTitle("Test suggestion 1")
+                .build();
+        final Suggestion suggestion2 = new Suggestion.Builder("id2")
+                .setTitle("Test suggestion 2")
+                .build();
+        mOneSuggestion = new ArrayList<>();
+        mOneSuggestion.add(suggestion1);
+        mTwoSuggestions = new ArrayList<>();
+        mTwoSuggestions.add(suggestion1);
+        mTwoSuggestions.add(suggestion2);
+    }
+
+    @Test
+    public void getItemCount_shouldReturnListSize() {
+        mSuggestionAdapter = new SuggestionAdapterV2(mContext, mSuggestionControllerMixin,
+                null /* savedInstanceState */, null /* callback */, null /* lifecycle */);
+        mSuggestionAdapter.setSuggestions(mOneSuggestion);
+        assertThat(mSuggestionAdapter.getItemCount()).isEqualTo(1);
+
+        mSuggestionAdapter.setSuggestions(mTwoSuggestions);
+        assertThat(mSuggestionAdapter.getItemCount()).isEqualTo(2);
+    }
+
+    @Test
+    public void getItemViewType_shouldReturnSuggestionTile() {
+        mSuggestionAdapter = new SuggestionAdapterV2(mContext, mSuggestionControllerMixin,
+                null /* savedInstanceState */, null /* callback */, null /* lifecycle */);
+        mSuggestionAdapter.setSuggestions(mOneSuggestion);
+        assertThat(mSuggestionAdapter.getItemViewType(0))
+                .isEqualTo(R.layout.suggestion_tile_v2);
+    }
+
+    @Test
+    public void getItemType_hasButton_shouldReturnSuggestionWithButton() {
+        final List<Suggestion> suggestions = new ArrayList<>();
+        suggestions.add(new Suggestion.Builder("id")
+                .setFlags(Suggestion.FLAG_HAS_BUTTON)
+                .setTitle("123")
+                .setSummary("456")
+                .build());
+        mSuggestionAdapter = new SuggestionAdapterV2(mContext, mSuggestionControllerMixin,
+                null /* savedInstanceState */, null /* callback */, null /* lifecycle */);
+        mSuggestionAdapter.setSuggestions(suggestions);
+
+        assertThat(mSuggestionAdapter.getItemViewType(0))
+                .isEqualTo(R.layout.suggestion_tile_with_button_v2);
+    }
+
+    @Test
+    public void onBindViewHolder_shouldLog() {
+        final View view = spy(LayoutInflater.from(mContext).inflate(
+                R.layout.suggestion_tile, new LinearLayout(mContext), true));
+        mSuggestionHolder = new DashboardAdapterV2.DashboardItemHolder(view);
+        mSuggestionAdapter = new SuggestionAdapterV2(mContext, mSuggestionControllerMixin,
+                null /* savedInstanceState */, null /* callback */, null /* lifecycle */);
+        mSuggestionAdapter.setSuggestions(mOneSuggestion);
+
+        // Bind twice
+        mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
+        mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
+
+        // Log once
+        verify(mFeatureFactory.metricsFeatureProvider).action(
+                mContext, MetricsProto.MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
+                mOneSuggestion.get(0).getId());
+    }
+
+    @Test
+    public void onBindViewHolder_itemViewShouldHandleClick()
+            throws PendingIntent.CanceledException {
+        final List<Suggestion> suggestions = makeSuggestions("pkg1");
+        setupSuggestions(mActivity, suggestions);
+
+        mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
+        mSuggestionHolder.itemView.performClick();
+
+        verify(mSuggestionControllerMixin).launchSuggestion(suggestions.get(0));
+        verify(suggestions.get(0).getPendingIntent()).send();
+    }
+
+    @Test
+    public void onBindViewHolder_hasButton_buttonShouldHandleClick()
+        throws PendingIntent.CanceledException {
+        final List<Suggestion> suggestions = new ArrayList<>();
+        final PendingIntent pendingIntent = mock(PendingIntent.class);
+        suggestions.add(new Suggestion.Builder("id")
+            .setFlags(Suggestion.FLAG_HAS_BUTTON)
+            .setTitle("123")
+            .setSummary("456")
+            .setPendingIntent(pendingIntent)
+            .build());
+        mSuggestionAdapter = new SuggestionAdapterV2(mContext, mSuggestionControllerMixin,
+            null /* savedInstanceState */, null /* callback */, null /* lifecycle */);
+        mSuggestionAdapter.setSuggestions(suggestions);
+        mSuggestionHolder = mSuggestionAdapter.onCreateViewHolder(
+            new FrameLayout(RuntimeEnvironment.application),
+            mSuggestionAdapter.getItemViewType(0));
+
+        mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
+        mSuggestionHolder.itemView.findViewById(android.R.id.primary).performClick();
+
+        verify(mSuggestionControllerMixin).launchSuggestion(suggestions.get(0));
+        verify(pendingIntent).send();
+    }
+
+    @Test
+    public void getSuggestions_shouldReturnSuggestionWhenMatch() {
+        final List<Suggestion> suggestions = makeSuggestions("pkg1");
+        setupSuggestions(mActivity, suggestions);
+
+        assertThat(mSuggestionAdapter.getSuggestion(0)).isNotNull();
+    }
+
+    @Test
+    public void onBindViewHolder_closeButtonShouldHandleClick()
+        throws PendingIntent.CanceledException {
+        final List<Suggestion> suggestions = makeSuggestions("pkg1");
+        final SuggestionAdapterV2.Callback callback = mock(SuggestionAdapterV2.Callback.class);
+        mSuggestionAdapter = new SuggestionAdapterV2(mActivity, mSuggestionControllerMixin,
+            null /* savedInstanceState */, callback, null /* lifecycle */);
+        mSuggestionAdapter.setSuggestions(suggestions);
+        mSuggestionHolder = mSuggestionAdapter.onCreateViewHolder(
+            new FrameLayout(RuntimeEnvironment.application),
+            mSuggestionAdapter.getItemViewType(0));
+
+        mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
+        mSuggestionHolder.itemView.findViewById(R.id.close_button).performClick();
+
+        verify(callback).onSuggestionClosed(suggestions.get(0));
+    }
+
+    private void setupSuggestions(Context context, List<Suggestion> suggestions) {
+        mSuggestionAdapter = new SuggestionAdapterV2(context, mSuggestionControllerMixin,
+                null /* savedInstanceState */, null /* callback */, null /* lifecycle */);
+        mSuggestionAdapter.setSuggestions(suggestions);
+        mSuggestionHolder = mSuggestionAdapter.onCreateViewHolder(
+                new FrameLayout(RuntimeEnvironment.application),
+                mSuggestionAdapter.getItemViewType(0));
+    }
+
+    private List<Suggestion> makeSuggestions(String... pkgNames) {
+        final List<Suggestion> suggestions = new ArrayList<>();
+        for (String pkgName : pkgNames) {
+            final Suggestion suggestion = new Suggestion.Builder(pkgName)
+                    .setPendingIntent(mock(PendingIntent.class))
+                    .build();
+            suggestions.add(suggestion);
+        }
+        return suggestions;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java
new file mode 100644
index 0000000..c9841f6
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+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.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;
+
+import android.content.Context;
+import android.content.om.IOverlayManager;
+import android.content.om.OverlayInfo;
+import android.support.v7.preference.TwoStatePreference;
+
+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.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class EmulateDisplayCutoutPreferenceControllerTest {
+
+    @Mock Context mContext;
+    @Mock IOverlayManager mOverlayManager;
+    @Mock TwoStatePreference mPreference;
+    EmulateDisplayCutoutPreferenceController mController;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        when(mOverlayManager.getOverlayInfo(any(), anyInt())).thenReturn(DISABLED);
+        mController = new EmulateDisplayCutoutPreferenceController(mContext, mOverlayManager);
+        mController.setPreference(mPreference);
+    }
+
+    @Test
+    public void isAvailable_true() throws Exception {
+        when(mOverlayManager.getOverlayInfo(any(), anyInt())).thenReturn(DISABLED);
+
+        assertThat(new EmulateDisplayCutoutPreferenceController(mContext, mOverlayManager)
+                .isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_false() throws Exception {
+        when(mOverlayManager.getOverlayInfo(any(), anyInt())).thenReturn(null);
+
+        assertThat(new EmulateDisplayCutoutPreferenceController(mContext, mOverlayManager)
+                .isAvailable()).isFalse();
+    }
+
+    @Test
+    public void onPreferenceChange_enable() throws Exception {
+        when(mOverlayManager.getOverlayInfo(any(), anyInt())).thenReturn(DISABLED);
+
+        mController.onPreferenceChange(null, true);
+
+        verify(mOverlayManager).setEnabled(any(), eq(true), anyInt());
+    }
+
+    @Test
+    public void onPreferenceChange_disable() throws Exception {
+        when(mOverlayManager.getOverlayInfo(any(), anyInt())).thenReturn(ENABLED);
+
+        mController.onPreferenceChange(null, false);
+
+        verify(mOverlayManager).setEnabled(any(), eq(false), anyInt());
+    }
+
+    @Test
+    public void updateState_enabled() throws Exception {
+        when(mOverlayManager.getOverlayInfo(any(), anyInt())).thenReturn(ENABLED);
+
+        mController.updateState(null);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_disabled() throws Exception {
+        when(mOverlayManager.getOverlayInfo(any(), anyInt())).thenReturn(DISABLED);
+
+        mController.updateState(null);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled() throws Exception {
+        when(mOverlayManager.getOverlayInfo(any(), anyInt())).thenReturn(DISABLED);
+
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+        verify(mOverlayManager, never()).setEnabled(any(), eq(true), anyInt());
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled() throws Exception {
+        when(mOverlayManager.getOverlayInfo(any(), anyInt())).thenReturn(ENABLED);
+
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setEnabled(false);
+        verify(mPreference).setChecked(false);
+        verify(mOverlayManager).setEnabled(any(), eq(false), anyInt());
+    }
+
+    static final OverlayInfo ENABLED = new OverlayInfo() {
+        @Override
+        public boolean isEnabled() {
+            return true;
+        }
+    };
+
+    static final OverlayInfo DISABLED = new OverlayInfo() {
+        @Override
+        public boolean isEnabled() {
+            return false;
+        }
+    };
+
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java
new file mode 100644
index 0000000..c691b55
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.android.settings.development.ShowFirstCrashDialogPreferenceController
+        .SETTING_VALUE_OFF;
+import static com.android.settings.development.ShowFirstCrashDialogPreferenceController
+        .SETTING_VALUE_ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+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 ShowFirstCrashDialogPreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private Context mContext;
+    private SwitchPreference mPreference;
+    private ShowFirstCrashDialogPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mPreference = new SwitchPreference(mContext);
+        mController = new ShowFirstCrashDialogPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_settingEnabled_showFirstCrashDialogShouldBeOn() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.SHOW_FIRST_CRASH_DIALOG_DEV_OPTION, -1 /* default */);
+
+        assertThat(mode).isEqualTo(SETTING_VALUE_ON);
+    }
+
+    @Test
+    public void onPreferenceChange_settingDisabled_showFirstCrashDialogShouldBeOff() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.SHOW_FIRST_CRASH_DIALOG_DEV_OPTION, -1 /* default */);
+
+        assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.SHOW_FIRST_CRASH_DIALOG_DEV_OPTION, SETTING_VALUE_OFF);
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+
+    @Test
+    public void updateState_settingEnabled_preferenceShouldBeChecked() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.SHOW_FIRST_CRASH_DIALOG_DEV_OPTION, SETTING_VALUE_ON);
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.SHOW_FIRST_CRASH_DIALOG_DEV_OPTION, -1 /* default */);
+
+        assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
+        assertThat(mPreference.isChecked()).isFalse();
+        assertThat(mPreference.isEnabled()).isFalse();
+    }
+
+    @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);
+
+        mController.displayPreference(mPreferenceScreen);
+
+        assertThat(mController.isAvailable()).isTrue();
+        assertThat(mPreference.isVisible()).isTrue();
+    }
+
+    @Test
+    public void onShowFirstCrashDialogGlobalOn_shouldDisablePreference() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.SHOW_FIRST_CRASH_DIALOG, SETTING_VALUE_ON);
+
+        mController.displayPreference(mPreferenceScreen);
+
+        assertThat(mController.isAvailable()).isFalse();
+        assertThat(mPreference.isVisible()).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/WifiAggressiveHandoverPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiAggressiveHandoverPreferenceControllerTest.java
deleted file mode 100644
index ebda837..0000000
--- a/tests/robotests/src/com/android/settings/development/WifiAggressiveHandoverPreferenceControllerTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.development;
-
-import static com.android.settings.development.WifiAggressiveHandoverPreferenceController
-        .SETTING_VALUE_OFF;
-import static com.android.settings.development.WifiAggressiveHandoverPreferenceController
-        .SETTING_VALUE_ON;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.net.wifi.WifiManager;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.PreferenceScreen;
-
-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.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class WifiAggressiveHandoverPreferenceControllerTest {
-
-    @Mock
-    private Context mContext;
-    @Mock
-    private WifiManager mWifiManager;
-    @Mock
-    private SwitchPreference mPreference;
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-
-    private WifiAggressiveHandoverPreferenceController mController;
-
-    @Before
-    public void setup() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
-        mController = new WifiAggressiveHandoverPreferenceController(mContext);
-        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
-                mPreference);
-        mController.displayPreference(mPreferenceScreen);
-    }
-
-    @Test
-    public void onPreferenceChange_settingEnabled_shouldEnableAggressiveHandover() {
-        mController.onPreferenceChange(mPreference, true /* new value */);
-
-        verify(mWifiManager).enableAggressiveHandover(SETTING_VALUE_ON);
-    }
-
-    @Test
-    public void onPreferenceChange_settingDisabled_shouldDisableAggressiveHandover() {
-        mController.onPreferenceChange(mPreference, false /* new value */);
-
-        verify(mWifiManager).enableAggressiveHandover(SETTING_VALUE_OFF);
-    }
-
-    @Test
-    public void updateState_settingEnabled_shouldEnablePreference() {
-        when(mWifiManager.getAggressiveHandover()).thenReturn(1);
-        mController.updateState(mPreference);
-
-        verify(mPreference).setChecked(true);
-    }
-
-    @Test
-    public void updateState_settingDisabled_shouldDisablePreference() {
-        when(mWifiManager.getAggressiveHandover()).thenReturn(0);
-        mController.updateState(mPreference);
-
-        verify(mPreference).setChecked(false);
-    }
-
-    @Test
-    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchEnabled();
-
-        verify(mPreference).setEnabled(true);
-    }
-
-    @Test
-    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
-        mController.onDeveloperOptionsSwitchDisabled();
-
-        verify(mWifiManager).enableAggressiveHandover(SETTING_VALUE_OFF);
-        verify(mPreference).setEnabled(false);
-        verify(mPreference).setChecked(false);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/development/qstile/LayerTraceTest.java b/tests/robotests/src/com/android/settings/development/qstile/LayerTraceTest.java
index 594b96c..0e42759 100644
--- a/tests/robotests/src/com/android/settings/development/qstile/LayerTraceTest.java
+++ b/tests/robotests/src/com/android/settings/development/qstile/LayerTraceTest.java
@@ -33,6 +33,7 @@
 
 import android.os.IBinder;
 import android.os.RemoteException;
+import android.widget.Toast;
 
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowParcel;
@@ -52,6 +53,8 @@
 public class LayerTraceTest {
     @Mock
     private IBinder mSurfaceFlinger;
+    @Mock
+    private Toast mToast;
 
     private DevelopmentTiles.LayerTrace mLayerTraceTile;
 
@@ -59,13 +62,14 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mLayerTraceTile = spy(new DevelopmentTiles.LayerTrace());
-        mLayerTraceTile.onCreate();
         ReflectionHelpers.setField(mLayerTraceTile, "mSurfaceFlinger", mSurfaceFlinger);
+        ReflectionHelpers.setField(mLayerTraceTile, "mToast", mToast);
     }
 
     @After
     public void after() {
         verifyNoMoreInteractions(mSurfaceFlinger);
+        verifyNoMoreInteractions(mToast);
     }
 
     @Test
@@ -106,12 +110,13 @@
 
     @Test
     @Config(shadows = {ShadowParcel.class})
-    public void setIsEnableFalse_shouldDisableLayerTrace() throws RemoteException {
+    public void setIsEnableFalse_shouldDisableLayerTraceAndShowToast() throws RemoteException {
         mLayerTraceTile.setIsEnabled(false);
         assertThat(ShadowParcel.sWriteIntResult).isEqualTo(0);
         verify(mSurfaceFlinger)
                 .transact(eq(SURFACE_FLINGER_LAYER_TRACE_CONTROL_CODE), any(), isNull(),
                         eq(0 /* flags */));
+        verify(mToast).show();
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/development/qstile/WindowTraceTest.java b/tests/robotests/src/com/android/settings/development/qstile/WindowTraceTest.java
index 3c4d9ba..d8a8084 100644
--- a/tests/robotests/src/com/android/settings/development/qstile/WindowTraceTest.java
+++ b/tests/robotests/src/com/android/settings/development/qstile/WindowTraceTest.java
@@ -25,12 +25,14 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 import android.os.RemoteException;
+import android.widget.Toast;
 
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowParcel;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.wrapper.IWindowManagerWrapper;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -44,6 +46,8 @@
 public class WindowTraceTest {
     @Mock
     private IWindowManagerWrapper mWindowManager;
+    @Mock
+    private Toast mToast;
 
     private DevelopmentTiles.WindowTrace mWindowTrace;
 
@@ -51,8 +55,13 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mWindowTrace = spy(new DevelopmentTiles.WindowTrace());
-        mWindowTrace.onCreate();
         ReflectionHelpers.setField(mWindowTrace, "mWindowManager", mWindowManager);
+        ReflectionHelpers.setField(mWindowTrace, "mToast", mToast);
+    }
+
+    @After
+    public void teardown() {
+        verifyNoMoreInteractions(mToast);
     }
 
     @Test
@@ -83,9 +92,10 @@
 
     @Test
     @Config(shadows = {ShadowParcel.class})
-    public void setIsEnableFalse_shouldDisableWindowTrace() throws RemoteException {
+    public void setIsEnableFalse_shouldDisableWindowTraceAndShowToast() throws RemoteException {
         mWindowTrace.setIsEnabled(false);
         verify(mWindowManager).stopWindowTrace();
+        verify(mToast).show();
         verifyNoMoreInteractions(mWindowManager);
     }
 
diff --git a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
index 5874984..d449419 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
@@ -17,9 +17,12 @@
 package com.android.settings.enterprise;
 
 import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
@@ -33,6 +36,7 @@
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 /**
@@ -42,15 +46,17 @@
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public final class ManageDeviceAdminPreferenceControllerTest {
 
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    @Mock
+    private Resources mResources;
+
     private Context mContext;
     private FakeFeatureFactory mFeatureFactory;
-
     private ManageDeviceAdminPreferenceController mController;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
         mFeatureFactory = FakeFeatureFactory.setupForTest();
         mController = new ManageDeviceAdminPreferenceController(mContext);
     }
@@ -61,25 +67,32 @@
 
         when(mFeatureFactory.enterprisePrivacyFeatureProvider
                 .getNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile()).thenReturn(0);
-        when(mContext.getResources().getString(R.string.number_of_device_admins_none))
+        when (mContext.getResources()).thenReturn(mResources);
+        when(mResources.getString(R.string.number_of_device_admins_none))
                 .thenReturn("no apps");
         mController.updateState(preference);
         assertThat(preference.getSummary()).isEqualTo("no apps");
 
         when(mFeatureFactory.enterprisePrivacyFeatureProvider
                 .getNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile()).thenReturn(5);
-        when(mContext.getResources().getQuantityString(R.plurals.number_of_device_admins, 5, 5))
+        when(mResources.getQuantityString(R.plurals.number_of_device_admins, 5, 5))
                 .thenReturn("5 active apps");
         mController.updateState(preference);
         assertThat(preference.getSummary()).isEqualTo("5 active apps");
     }
 
     @Test
-    public void testIsAvailable() {
+    public void isAvailable_byDefault_isTrue() {
         assertThat(mController.isAvailable()).isTrue();
     }
 
     @Test
+    @Config(qualifiers = "mcc999")
+    public void isAvailable_whenNotVisible_isFalse() {
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
     public void testHandlePreferenceTreeClick() {
         assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0)))
                 .isFalse();
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java
index e4e8eef..53c9766 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java
@@ -18,12 +18,18 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
 
 import android.content.Context;
+import android.content.Intent;
+import android.os.PowerManager;
 
 import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.TestConfig;
+import com.android.settings.fuelgauge.BatteryInfo;
+import com.android.settings.fuelgauge.BatteryUtils;
 import com.android.settings.fuelgauge.batterytip.detectors.BatteryTipDetector;
 import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -42,46 +48,45 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class BatteryTipLoaderTest {
+    private static final int[] TIP_ORDER = {
+            BatteryTip.TipType.SMART_BATTERY_MANAGER,
+            BatteryTip.TipType.HIGH_DEVICE_USAGE,
+            BatteryTip.TipType.BATTERY_SAVER,
+            BatteryTip.TipType.LOW_BATTERY,
+            BatteryTip.TipType.SUMMARY};
     @Mock
     private BatteryStatsHelper mBatteryStatsHelper;
     @Mock
-    private BatteryTipDetector mBatteryTipDetector;
+    private PowerManager mPowerManager;
     @Mock
-    private BatteryTip mBatteryTip;
+    private Intent mIntent;
+    @Mock
+    private BatteryUtils mBatteryUtils;
+    @Mock
+    private BatteryInfo mBatteryInfo;
     private Context mContext;
     private BatteryTipLoader mBatteryTipLoader;
-    private List<BatteryTip> mBatteryTips;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
-        mContext = RuntimeEnvironment.application;
-        doReturn(mBatteryTip).when(mBatteryTipDetector).detect();
+        mContext = spy(RuntimeEnvironment.application);
+        doReturn(mContext).when(mContext).getApplicationContext();
+        doReturn(mPowerManager).when(mContext).getSystemService(Context.POWER_SERVICE);
+        doReturn(mIntent).when(mContext).registerReceiver(any(), any());
+        doReturn(mBatteryInfo).when(mBatteryUtils).getBatteryInfo(any(), any());
         mBatteryTipLoader = new BatteryTipLoader(mContext, mBatteryStatsHelper);
-        mBatteryTips = new ArrayList<>();
+        mBatteryTipLoader.mBatteryUtils = mBatteryUtils;
     }
 
     @Test
-    public void testAddBatteryTipFromDetector_tipVisible_addAndUpdateCount() {
-        doReturn(true).when(mBatteryTip).isVisible();
-        mBatteryTipLoader.mVisibleTips = 0;
+    public void testLoadBackground_containsAllTipsWithOrder() {
+        final List<BatteryTip> batteryTips = mBatteryTipLoader.loadInBackground();
 
-        mBatteryTipLoader.addBatteryTipFromDetector(mBatteryTips, mBatteryTipDetector);
-
-        assertThat(mBatteryTips.contains(mBatteryTip)).isTrue();
-        assertThat(mBatteryTipLoader.mVisibleTips).isEqualTo(1);
+        assertThat(batteryTips.size()).isEqualTo(TIP_ORDER.length);
+        for (int i = 0, size = batteryTips.size(); i < size; i++) {
+            assertThat(batteryTips.get(i).getType()).isEqualTo(TIP_ORDER[i]);
+        }
     }
-
-    @Test
-    public void testAddBatteryTipFromDetector_tipInvisible_doNotAddCount() {
-        doReturn(false).when(mBatteryTip).isVisible();
-        mBatteryTipLoader.mVisibleTips = 0;
-
-        mBatteryTipLoader.addBatteryTipFromDetector(mBatteryTips, mBatteryTipDetector);
-
-        assertThat(mBatteryTips.contains(mBatteryTip)).isTrue();
-        assertThat(mBatteryTipLoader.mVisibleTips).isEqualTo(0);
-    }
-
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java
index 1198b27..bb9a37b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java
@@ -86,9 +86,9 @@
         assertThat(batteryTipPolicy.highUsageEnabled).isTrue();
         assertThat(batteryTipPolicy.highUsageAppCount).isEqualTo(3);
         assertThat(batteryTipPolicy.appRestrictionEnabled).isTrue();
-        assertThat(batteryTipPolicy.reducedBatteryEnabled).isTrue();
+        assertThat(batteryTipPolicy.reducedBatteryEnabled).isFalse();
         assertThat(batteryTipPolicy.reducedBatteryPercent).isEqualTo(50);
-        assertThat(batteryTipPolicy.lowBatteryEnabled).isTrue();
+        assertThat(batteryTipPolicy.lowBatteryEnabled).isFalse();
         assertThat(batteryTipPolicy.lowBatteryHour).isEqualTo(16);
     }
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java
new file mode 100644
index 0000000..ace6da9
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java
@@ -0,0 +1,101 @@
+/*
+ * 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.fuelgauge.batterytip.detectors;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.BatteryManager;
+import android.os.PowerManager;
+
+import com.android.settings.TestConfig;
+import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.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 class EarlyWarningDetectorTest {
+    private Context mContext;
+    private BatteryTipPolicy mPolicy;
+    private EarlyWarningDetector mEarlyWarningDetector;
+    @Mock
+    private Intent mIntent;
+    @Mock
+    private PowerManager mPowerManager;
+    private FakeFeatureFactory mFakeFeatureFactory;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(RuntimeEnvironment.application);
+        mPolicy = spy(new BatteryTipPolicy(mContext));
+        doReturn(mPowerManager).when(mContext).getSystemService(Context.POWER_SERVICE);
+        doReturn(mIntent).when(mContext).registerReceiver(any(), any());
+        doReturn(0).when(mIntent).getIntExtra(BatteryManager.EXTRA_PLUGGED, -1);
+        mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
+        doReturn(true).when(mFakeFeatureFactory.powerUsageFeatureProvider).getEarlyWarningSignal(
+                any(), any());
+
+        mEarlyWarningDetector = new EarlyWarningDetector(mPolicy, mContext);
+    }
+
+    @Test
+    public void testDetect_policyDisabled_tipInvisible() {
+        ReflectionHelpers.setField(mPolicy, "batterySaverTipEnabled", false);
+
+        assertThat(mEarlyWarningDetector.detect().isVisible()).isFalse();
+    }
+
+    @Test
+    public void testDetect_batterySaverOn_tipInvisible() {
+        doReturn(true).when(mPowerManager).isPowerSaveMode();
+
+        assertThat(mEarlyWarningDetector.detect().isVisible()).isFalse();
+    }
+
+    @Test
+    public void testDetect_charging_tipInvisible() {
+        doReturn(1).when(mIntent).getIntExtra(BatteryManager.EXTRA_PLUGGED, -1);
+
+        assertThat(mEarlyWarningDetector.detect().isVisible()).isFalse();
+    }
+
+    @Test
+    public void testDetect_noEarlyWarning_tipInvisible() {
+        doReturn(false).when(mFakeFeatureFactory.powerUsageFeatureProvider).getEarlyWarningSignal(
+                any(), any());
+
+        assertThat(mEarlyWarningDetector.detect().isVisible()).isFalse();
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java
index 4866a6a..d953b7c 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java
@@ -52,6 +52,8 @@
 
         mContext = RuntimeEnvironment.application;
         mPolicy = spy(new BatteryTipPolicy(mContext));
+        ReflectionHelpers.setField(mPolicy, "lowBatteryEnabled", true);
+
         mLowBatteryDetector = new LowBatteryDetector(mPolicy, mBatteryInfo);
     }
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java
index 389a6c3..12e98e9 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java
@@ -51,22 +51,15 @@
     @Test
     public void testDetect_disabledByPolicy_tipInvisible() {
         ReflectionHelpers.setField(mPolicy, "summaryEnabled", false);
-        SummaryDetector detector = new SummaryDetector(mPolicy, 0 /* visibleTips */);
+        SummaryDetector detector = new SummaryDetector(mPolicy);
 
         assertThat(detector.detect().isVisible()).isFalse();
     }
 
     @Test
-    public void testDetect_noOtherTips_tipVisible() {
-        SummaryDetector detector = new SummaryDetector(mPolicy, 0 /* visibleTips */);
+    public void testDetect_notDisabled_tipVisible() {
+        SummaryDetector detector = new SummaryDetector(mPolicy);
 
         assertThat(detector.detect().isVisible()).isTrue();
     }
-
-    @Test
-    public void testDetect_hasOtherTips_tipInVisible() {
-        SummaryDetector detector = new SummaryDetector(mPolicy, 1 /* visibleTips */);
-
-        assertThat(detector.detect().isVisible()).isFalse();
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTipTest.java
new file mode 100644
index 0000000..66d5f81
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTipTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.fuelgauge.batterytip.tips;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.Parcel;
+
+import com.android.settings.R;
+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.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class EarlyWarningTipTest {
+    private Context mContext;
+    private EarlyWarningTip mEarlyWarningTip;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mEarlyWarningTip = new EarlyWarningTip(BatteryTip.StateType.NEW,
+                false /* powerSaveModeOn */);
+    }
+
+    @Test
+    public void testParcelable() {
+        Parcel parcel = Parcel.obtain();
+        mEarlyWarningTip.writeToParcel(parcel, mEarlyWarningTip.describeContents());
+        parcel.setDataPosition(0);
+
+        final EarlyWarningTip parcelTip = new EarlyWarningTip(parcel);
+
+        assertThat(parcelTip.isPowerSaveModeOn()).isFalse();
+    }
+
+    @Test
+    public void testInfo_stateNew_displayPowerModeInfo() {
+        final EarlyWarningTip tip = new EarlyWarningTip(BatteryTip.StateType.NEW,
+                false /* powerModeOn */);
+
+        assertThat(tip.getTitle(mContext)).isEqualTo("Turn on Low Battery Mode");
+        assertThat(tip.getSummary(mContext)).isEqualTo("Extend your battery life");
+        assertThat(tip.getIconId()).isEqualTo(R.drawable.ic_battery_alert_24dp);
+    }
+
+    @Test
+    public void testInfo_stateHandled_displayPowerModeHandledInfo() {
+        final EarlyWarningTip tip = new EarlyWarningTip(BatteryTip.StateType.HANDLED,
+                false /* powerModeOn */);
+
+        assertThat(tip.getTitle(mContext)).isEqualTo("Low Battery Mode is on");
+        assertThat(tip.getSummary(mContext)).isEqualTo("Some features are limited");
+        assertThat(tip.getIconId()).isEqualTo(R.drawable.ic_perm_device_information_green_24dp);
+    }
+
+    @Test
+    public void testUpdate_powerModeTurnedOn_typeBecomeHandled() {
+        final EarlyWarningTip nextTip = new EarlyWarningTip(BatteryTip.StateType.INVISIBLE,
+                true /* powerModeOn */);
+
+        mEarlyWarningTip.updateState(nextTip);
+
+        assertThat(mEarlyWarningTip.getState()).isEqualTo(BatteryTip.StateType.HANDLED);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java
index 462b926..f456f41 100644
--- a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java
@@ -209,6 +209,23 @@
         assertThat(mEnabler.isManagedProfileRestrictedByBase()).isTrue();
     }
 
+    @Test
+    public void setRestriction_getShareLocationEnforcedAdmin_shouldReturnEnforcedAdmin() {
+        int userId = UserHandle.myUserId();
+        List<UserManager.EnforcingUser> enforcingUsers = new ArrayList<>();
+        // Add two enforcing users so that RestrictedLockUtils.checkIfRestrictionEnforced returns
+        // non-null.
+        enforcingUsers.add(new UserManager.EnforcingUser(userId,
+                UserManager.RESTRICTION_SOURCE_DEVICE_OWNER));
+        enforcingUsers.add(new UserManager.EnforcingUser(userId,
+                UserManager.RESTRICTION_SOURCE_PROFILE_OWNER));
+        when(mUserManager.getUserRestrictionSources(
+                UserManager.DISALLOW_CONFIG_LOCATION_MODE, UserHandle.of(userId)))
+                .thenReturn(enforcingUsers);
+
+        assertThat(mEnabler.getShareLocationEnforcedAdmin(userId) != null).isTrue();
+    }
+
     private void mockManagedProfile() {
         final List<UserHandle> userProfiles = new ArrayList<>();
         final UserHandle userHandle = mock(UserHandle.class);
@@ -223,4 +240,6 @@
     private static ArgumentMatcher<Intent> actionMatches(String expected) {
         return intent -> TextUtils.equals(expected, intent.getAction());
     }
+
+
 }
diff --git a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
index b1072b1..320ae9e 100644
--- a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.network;
 
-import static junit.framework.Assert.assertFalse;
+import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
@@ -38,24 +38,20 @@
 import org.mockito.Answers;
 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 AirplaneModePreferenceControllerTest {
 
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-
-    @Mock
-    private Resources mResources;
-
     @Mock
     private PreferenceScreen mScreen;
 
     @Mock
     private PackageManager mPackageManager;
 
+    private Context mContext;
     private AirplaneModePreferenceController mController;
     private LifecycleOwner mLifecycleOwner;
     private Lifecycle mLifecycle;
@@ -65,7 +61,7 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mFactory = FakeFeatureFactory.setupForTest();
-        doReturn(mResources).when(mContext).getResources();
+        mContext = spy(RuntimeEnvironment.application);
         doReturn(mPackageManager).when(mContext).getPackageManager();
         mController = spy(new AirplaneModePreferenceController(mContext, null));
         mLifecycleOwner = () -> mLifecycle;
@@ -74,9 +70,9 @@
     }
 
     @Test
-    public void airplaneModePreference_shouldNotBeAvailable_ifHasLeanbackFeature() {
-        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)).thenReturn(true);
-        assertFalse(mController.isAvailable());
+    @Config(qualifiers = "mcc999")
+    public void airplaneModePreference_shouldNotBeAvailable_ifSetToNotVisible() {
+        assertThat(mController.isAvailable()).isFalse();
 
         mController.displayPreference(mScreen);
 
@@ -84,4 +80,22 @@
         mController.onResume();
         mController.onPause();
     }
+
+    @Test
+    public void airplaneModePreference_shouldNotBeAvailable_ifHasLeanbackFeature() {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)).thenReturn(true);
+        assertThat(mController.isAvailable()).isFalse();
+
+        mController.displayPreference(mScreen);
+
+        // This should not crash
+        mController.onResume();
+        mController.onPause();
+    }
+
+    @Test
+    public void airplaneModePreference_shouldBeAvailable_ifNoLeanbackFeature() {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)).thenReturn(false);
+        assertThat(mController.isAvailable()).isTrue();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceTest.java b/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceTest.java
new file mode 100644
index 0000000..033c221
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceTest.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.nfc;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.support.v7.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+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 NfcForegroundPreferenceTest {
+    @Mock
+    private PaymentBackend mPaymentBackend;
+
+    private Context mContext;
+    private PreferenceScreen mScreen;
+    private NfcForegroundPreference mPreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mScreen = spy(new PreferenceScreen(mContext, null));
+        when(mScreen.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
+        when(mPaymentBackend.isForegroundMode()).thenReturn(false);
+        mPreference = new NfcForegroundPreference(mContext, mPaymentBackend);
+        mScreen.addPreference(mPreference);
+    }
+
+    @Test
+    public void testTogglingMode() {
+        String nfc_payment_favor_default = mContext.getString(R.string.nfc_payment_favor_default);
+        String nfc_payment_favor_open = mContext.getString(R.string.nfc_payment_favor_open);
+
+        assertThat(mPreference.getEntry()).isEqualTo(nfc_payment_favor_default);
+        assertThat(mPreference.getSummary()).isEqualTo(nfc_payment_favor_default);
+
+        mPreference.setValueIndex(0);
+        mPreference.callChangeListener(mPreference.getEntryValues()[0]);
+        verify(mPaymentBackend).setForegroundMode(true);
+        assertThat(mPreference.getEntry()).isEqualTo(nfc_payment_favor_open);
+        assertThat(mPreference.getSummary()).isEqualTo(nfc_payment_favor_open);
+
+        mPreference.setValueIndex(1);
+        mPreference.callChangeListener(mPreference.getEntryValues()[1]);
+        verify(mPaymentBackend).setForegroundMode(false);
+        assertThat(mPreference.getEntry()).isEqualTo(nfc_payment_favor_default);
+        assertThat(mPreference.getSummary()).isEqualTo(nfc_payment_favor_default);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/search/AccessibilityServiceResultFutureTaskTest.java b/tests/robotests/src/com/android/settings/search/AccessibilityServiceResultFutureTaskTest.java
deleted file mode 100644
index b4f07d7..0000000
--- a/tests/robotests/src/com/android/settings/search/AccessibilityServiceResultFutureTaskTest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.search;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import android.accessibilityservice.AccessibilityServiceInfo;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.os.UserManager;
-import android.view.accessibility.AccessibilityManager;
-
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AccessibilityServiceResultFutureTaskTest {
-
-    private static final String QUERY = "test_query";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private AccessibilityManager mAccessibilityManager;
-    @Mock
-    private SiteMapManager mSiteMapManager;
-    @Mock
-    private UserManager mUserManager;
-
-    private AccessibilityServiceResultLoader.AccessibilityServiceResultCallable mCallable;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.ACCESSIBILITY_SERVICE))
-                .thenReturn(mAccessibilityManager);
-        when((Object)mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-
-        mCallable = new AccessibilityServiceResultLoader.AccessibilityServiceResultCallable(
-                mContext, QUERY, mSiteMapManager);
-    }
-
-    @Test
-    public void query_noService_shouldNotReturnAnything() throws Exception {
-        assertThat(mCallable.call()).isEmpty();
-    }
-
-    @Test
-    public void query_hasServiceMatchingTitle_shouldReturnResult() throws Exception {
-        addFakeAccessibilityService();
-
-        List<? extends SearchResult> results = mCallable.call();
-        assertThat(results).hasSize(1);
-
-        SearchResult result = results.get(0);
-        assertThat(result.title).isEqualTo(QUERY);
-    }
-
-    @Test
-    public void query_serviceDoesNotMatchTitle_shouldReturnResult() throws Exception {
-        addFakeAccessibilityService();
-
-        mCallable = new AccessibilityServiceResultLoader.AccessibilityServiceResultCallable(
-                mContext,
-                QUERY + "no_match", mSiteMapManager);
-
-        assertThat(mCallable.call()).isEmpty();
-    }
-
-    private void addFakeAccessibilityService() {
-        final List<AccessibilityServiceInfo> services = new ArrayList<>();
-        final AccessibilityServiceInfo info = mock(AccessibilityServiceInfo.class);
-        final ResolveInfo resolveInfo = mock(ResolveInfo.class);
-        when(info.getResolveInfo()).thenReturn(resolveInfo);
-        when(resolveInfo.loadIcon(mPackageManager)).thenReturn(new ColorDrawable(Color.BLUE));
-        when(resolveInfo.loadLabel(mPackageManager)).thenReturn(QUERY);
-        resolveInfo.serviceInfo = new ServiceInfo();
-        resolveInfo.serviceInfo.packageName = "pkg";
-        resolveInfo.serviceInfo.name = "class";
-        services.add(info);
-
-        when(mAccessibilityManager.getInstalledAccessibilityServiceList()).thenReturn(services);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java b/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java
deleted file mode 100644
index ca98c15..0000000
--- a/tests/robotests/src/com/android/settings/search/InlineSwitchViewHolderTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.view.LayoutInflater;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class InlineSwitchViewHolderTest {
-
-    private static final String TITLE = "title";
-    private static final String SUMMARY = "summary";
-
-    @Mock
-    private SearchFragment mFragment;
-
-    @Mock
-    private InlineSwitchPayload mPayload;
-
-    private FakeFeatureFactory mFeatureFactory;
-    private InlineSwitchViewHolder mHolder;
-    private Drawable mIcon;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        final Context context = RuntimeEnvironment.application;
-        mIcon = context.getDrawable(R.drawable.ic_search_24dp);
-        mFeatureFactory = FakeFeatureFactory.setupForTest();
-
-        mHolder = new InlineSwitchViewHolder(
-                LayoutInflater.from(context).inflate(R.layout.search_inline_switch_item, null),
-                context);
-        ReflectionHelpers.setField(mHolder, "mMetricsFeatureProvider",
-                mFeatureFactory.metricsFeatureProvider);
-    }
-
-    @Test
-    public void testConstructor_MembersNotNull() {
-        assertThat(mHolder.titleView).isNotNull();
-        assertThat(mHolder.summaryView).isNotNull();
-        assertThat(mHolder.iconView).isNotNull();
-        assertThat(mHolder.switchView).isNotNull();
-    }
-
-    @Test
-    public void testBindViewElements_AllUpdated() {
-        when(mPayload.getValue(any(Context.class))).thenReturn(1);
-        SearchResult result = getSearchResult();
-        mHolder.onBind(mFragment, result);
-        // Precondition: switch is on.
-        assertThat(mHolder.switchView.isChecked()).isTrue();
-
-        mHolder.switchView.performClick();
-
-        assertThat(mHolder.titleView.getText()).isEqualTo(TITLE);
-        assertThat(mHolder.summaryView.getText()).isEqualTo(SUMMARY);
-        assertThat(mHolder.iconView.getDrawable()).isEqualTo(mIcon);
-        assertThat(mHolder.switchView.isChecked()).isFalse();
-    }
-
-    private SearchResult getSearchResult() {
-        SearchResult.Builder builder = new SearchResult.Builder();
-
-        builder.setTitle(TITLE)
-                .setSummary(SUMMARY)
-                .setRank(1)
-                .setPayload(new InlineSwitchPayload("" /* uri */, 0 /* mSettingSource */,
-                        1 /* onValue */, null /* intent */, true /* isDeviceSupported */,
-                        1 /* default */))
-                .addBreadcrumbs(new ArrayList<>())
-                .setIcon(mIcon)
-                .setPayload(mPayload)
-                .setStableId(TITLE.hashCode());
-
-        return builder.build();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/InputDeviceResultFutureTaskTest.java b/tests/robotests/src/com/android/settings/search/InputDeviceResultFutureTaskTest.java
deleted file mode 100644
index e31b3d7..0000000
--- a/tests/robotests/src/com/android/settings/search/InputDeviceResultFutureTaskTest.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.search;
-
-import static android.content.Context.INPUT_METHOD_SERVICE;
-
-import static com.android.settings.search.InputDeviceResultLoader.PHYSICAL_KEYBOARD_FRAGMENT;
-import static com.android.settings.search.InputDeviceResultLoader.VIRTUAL_KEYBOARD_FRAGMENT;
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.content.pm.ServiceInfo;
-import android.hardware.input.InputManager;
-import android.view.InputDevice;
-import android.view.inputmethod.InputMethodInfo;
-import android.view.inputmethod.InputMethodManager;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowInputDevice;
-
-import org.junit.After;
-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 java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                ShadowInputDevice.class
-        })
-public class InputDeviceResultFutureTaskTest {
-
-    private static final String QUERY = "test_query";
-    private static final List<String> PHYSICAL_KEYBOARD_BREADCRUMB;
-    private static final List<String> VIRTUAL_KEYBOARD_BREADCRUMB;
-
-    static {
-        PHYSICAL_KEYBOARD_BREADCRUMB = new ArrayList<>();
-        VIRTUAL_KEYBOARD_BREADCRUMB = new ArrayList<>();
-        PHYSICAL_KEYBOARD_BREADCRUMB.add("Settings");
-        PHYSICAL_KEYBOARD_BREADCRUMB.add("physical keyboard");
-        VIRTUAL_KEYBOARD_BREADCRUMB.add("Settings");
-        VIRTUAL_KEYBOARD_BREADCRUMB.add("virtual keyboard");
-    }
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private SiteMapManager mSiteMapManager;
-    @Mock
-    private InputManager mInputManager;
-    @Mock
-    private InputMethodManager mImm;
-    @Mock
-    private PackageManager mPackageManager;
-
-    private InputDeviceResultLoader.InputDeviceResultCallable mCallable;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getApplicationContext()).thenReturn(mContext);
-        when(mContext.getSystemService(Context.INPUT_SERVICE))
-                .thenReturn(mInputManager);
-        when(mContext.getSystemService(INPUT_METHOD_SERVICE))
-                .thenReturn(mImm);
-        when(mContext.getPackageManager())
-                .thenReturn(mPackageManager);
-        when(mContext.getString(anyInt()))
-                .thenAnswer(invocation -> RuntimeEnvironment.application.getString(
-                        (Integer) invocation.getArguments()[0]));
-        mCallable = new InputDeviceResultLoader.InputDeviceResultCallable(mContext, QUERY,
-                mSiteMapManager);
-    }
-
-    @After
-    public void tearDown() {
-        ShadowInputDevice.reset();
-    }
-
-    @Test
-    public void query_noKeyboard_shouldNotReturnAnything() throws Exception {
-
-        assertThat(mCallable.call()).isEmpty();
-    }
-
-    @Test
-    public void query_hasPhysicalKeyboard_match() throws Exception {
-        addPhysicalKeyboard(QUERY);
-        when(mSiteMapManager.buildBreadCrumb(mContext, PHYSICAL_KEYBOARD_FRAGMENT,
-                RuntimeEnvironment.application.getString(R.string.physical_keyboard_title)))
-                .thenReturn(PHYSICAL_KEYBOARD_BREADCRUMB);
-
-        final List<? extends SearchResult> results = mCallable.call();
-
-        assertThat(results).hasSize(1);
-        assertThat(results.get(0).title).isEqualTo(QUERY);
-        assertThat(results.get(0).breadcrumbs)
-                .containsExactlyElementsIn(PHYSICAL_KEYBOARD_BREADCRUMB);
-    }
-
-    @Test
-    public void query_hasVirtualKeyboard_match() throws Exception {
-        addVirtualKeyboard(QUERY);
-        when(mSiteMapManager.buildBreadCrumb(mContext, VIRTUAL_KEYBOARD_FRAGMENT,
-                RuntimeEnvironment.application.getString(R.string.add_virtual_keyboard)))
-                .thenReturn(VIRTUAL_KEYBOARD_BREADCRUMB);
-
-        final List<? extends SearchResult> results = mCallable.call();
-        assertThat(results).hasSize(1);
-        assertThat(results.get(0).title).isEqualTo(QUERY);
-        assertThat(results.get(0).breadcrumbs)
-                .containsExactlyElementsIn(VIRTUAL_KEYBOARD_BREADCRUMB);
-    }
-
-    @Test
-    public void query_hasPhysicalVirtualKeyboard_doNotMatch() throws Exception {
-        addPhysicalKeyboard("abc");
-        addVirtualKeyboard("def");
-
-        assertThat(mCallable.call()).isEmpty();
-        verifyZeroInteractions(mSiteMapManager);
-    }
-
-    private void addPhysicalKeyboard(String name) {
-        final InputDevice device = mock(InputDevice.class);
-        when(device.isVirtual()).thenReturn(false);
-        when(device.isFullKeyboard()).thenReturn(true);
-        when(device.getName()).thenReturn(name);
-        ShadowInputDevice.sDeviceIds = new int[]{0};
-        ShadowInputDevice.addDevice(0, device);
-    }
-
-    private void addVirtualKeyboard(String name) {
-        final List<InputMethodInfo> imis = new ArrayList<>();
-        final InputMethodInfo info = mock(InputMethodInfo.class);
-        imis.add(info);
-        when(info.getServiceInfo()).thenReturn(new ServiceInfo());
-        when(info.loadLabel(mPackageManager)).thenReturn(name);
-        info.getServiceInfo().packageName = "pkg";
-        info.getServiceInfo().name = "class";
-        when(mImm.getInputMethodList()).thenReturn(imis);
-    }
-
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java b/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java
deleted file mode 100644
index 1cf1480..0000000
--- a/tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java
+++ /dev/null
@@ -1,441 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import static android.content.pm.ApplicationInfo.FLAG_SYSTEM;
-import static android.content.pm.ApplicationInfo.FLAG_UPDATED_SYSTEM_APP;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyList;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.ResolveInfo;
-import android.content.pm.UserInfo;
-import android.os.UserHandle;
-import android.os.UserManager;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.testutils.ApplicationTestUtils;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.wrapper.PackageManagerWrapper;
-
-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.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class InstalledAppResultLoaderTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private PackageManagerWrapper mPackageManagerWrapper;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
-    private SiteMapManager mSiteMapManager;
-
-    private InstalledAppResultLoader.InstalledAppResultCallable mCallable;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        final FakeFeatureFactory factory = FakeFeatureFactory.setupForTest();
-        when(factory.searchFeatureProvider.getSiteMapManager())
-                .thenReturn(mSiteMapManager);
-        final List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", 0));
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        when(mContext.getString(R.string.applications_settings))
-                .thenReturn("app");
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, "app1", FLAG_SYSTEM,
-                                0 /* targetSdkVersion */),
-                        ApplicationTestUtils.buildInfo(0 /* uid */, "app2", FLAG_SYSTEM,
-                                0 /* targetSdkVersion */),
-                        ApplicationTestUtils.buildInfo(0 /* uid */, "app3", FLAG_SYSTEM,
-                                0 /* targetSdkVersion */),
-                        ApplicationTestUtils.buildInfo(0 /* uid */, "app4", 0 /* flags */,
-                                0 /* targetSdkVersion */),
-                        ApplicationTestUtils.buildInfo(0 /* uid */, "app", 0 /* flags */,
-                                0 /* targetSdkVersion */),
-                        ApplicationTestUtils.buildInfo(0 /* uid */, "appBuffer", 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-    }
-
-    @Test
-    public void query_noMatchingQuery_shouldReturnEmptyResult() throws Exception {
-        final String query = "abc";
-
-        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
-                mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mCallable.call()).isEmpty();
-    }
-
-    @Test
-    public void query_matchingQuery_shouldReturnNonSystemApps() throws Exception {
-        final String query = "app";
-
-        mCallable = spy(new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
-                mPackageManagerWrapper, query,
-                mSiteMapManager));
-        when(mSiteMapManager.buildBreadCrumb(eq(mContext), anyString(), anyString()))
-                .thenReturn(Arrays.asList(new String[] {"123"}));
-
-        assertThat(mCallable.call()).hasSize(3);
-        verify(mSiteMapManager)
-                .buildBreadCrumb(eq(mContext), anyString(), anyString());
-    }
-
-    @Test
-    public void query_matchingQuery_shouldReturnSystemAppUpdates() throws Exception {
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, "app1", FLAG_UPDATED_SYSTEM_APP,
-                                0 /* targetSdkVersion */)));
-        final String query = "app";
-
-        mCallable = spy(new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
-                mPackageManagerWrapper, query,
-                mSiteMapManager));
-
-        assertThat(mCallable.call()).hasSize(1);
-        verify(mSiteMapManager)
-                .buildBreadCrumb(eq(mContext), anyString(), anyString());
-    }
-
-    @Test
-    public void query_matchingQuery_shouldReturnSystemAppIfLaunchable() throws Exception {
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, "app1", FLAG_SYSTEM,
-                                0 /* targetSdkVersion */)));
-        final List<ResolveInfo> list = mock(List.class);
-        when(list.size()).thenReturn(1);
-        when(mPackageManagerWrapper.queryIntentActivitiesAsUser(
-                any(Intent.class), anyInt(), anyInt()))
-                .thenReturn(list);
-
-        final String query = "app";
-
-        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
-                mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mCallable.call()).hasSize(1);
-    }
-
-    @Test
-    public void query_matchingQuery_shouldReturnSystemAppIfHomeApp() throws Exception {
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, "app1", FLAG_SYSTEM,
-                                0 /* targetSdkVersion */)));
-        when(mPackageManagerWrapper.queryIntentActivitiesAsUser(
-                any(Intent.class), anyInt(), anyInt()))
-                .thenReturn(null);
-
-        when(mPackageManagerWrapper.getHomeActivities(anyList())).thenAnswer(invocation -> {
-            final List<ResolveInfo> list = (List<ResolveInfo>) invocation.getArguments()[0];
-            final ResolveInfo info = new ResolveInfo();
-            info.activityInfo = new ActivityInfo();
-            info.activityInfo.packageName = "app1";
-            list.add(info);
-            return null;
-        });
-
-        final String query = "app";
-
-        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
-                mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mCallable.call()).hasSize(1);
-    }
-
-    @Test
-    public void query_matchingQuery_shouldNotReturnSystemAppIfNotLaunchable() throws Exception {
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, "app1", FLAG_SYSTEM,
-                                0 /* targetSdkVersion */)));
-        when(mPackageManagerWrapper.queryIntentActivitiesAsUser(
-                any(Intent.class), anyInt(), anyInt()))
-                .thenReturn(null);
-
-        final String query = "app";
-
-        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
-                mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mCallable.call()).isEmpty();
-        verify(mSiteMapManager, never())
-                .buildBreadCrumb(eq(mContext), anyString(), anyString());
-    }
-
-    @Test
-    public void query_matchingQuery_multipleResults() throws Exception {
-        final String query = "app";
-
-        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
-                mPackageManagerWrapper, query,
-                mSiteMapManager);
-        final List<? extends SearchResult> results = mCallable.call();
-
-        Set<CharSequence> expectedTitles = new HashSet<>(Arrays.asList("app4", "app", "appBuffer"));
-        Set<CharSequence> actualTitles = new HashSet<>();
-        for (SearchResult result : results) {
-            actualTitles.add(result.title);
-        }
-        assertThat(actualTitles).isEqualTo(expectedTitles);
-    }
-
-    @Test
-    public void query_normalWord_MatchPrefix() throws Exception {
-        final String query = "ba";
-        final String packageName = "Bananas";
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
-                mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mCallable.call()).hasSize(1);
-    }
-
-    @Test
-    public void query_CapitalCase_DoestMatchSecondWord() throws Exception {
-        final String query = "Apples";
-        final String packageName = "BananasApples";
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
-                mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mCallable.call()).isEmpty();
-    }
-
-    @Test
-    public void query_TwoWords_MatchesFirstWord() throws Exception {
-        final String query = "Banana";
-        final String packageName = "Bananas Apples";
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
-                mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mCallable.call()).hasSize(1);
-    }
-
-    @Test
-    public void query_TwoWords_MatchesSecondWord() throws Exception {
-        final String query = "Apple";
-        final String packageName = "Bananas Apples";
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
-                mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mCallable.call()).hasSize(1);
-    }
-
-    @Test
-    public void query_ThreeWords_MatchesThirdWord() throws Exception {
-        final String query = "Pear";
-        final String packageName = "Bananas Apples Pears";
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
-                mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mCallable.call()).hasSize(1);
-    }
-
-    @Test
-    public void query_DoubleSpacedWords_MatchesSecondWord() throws Exception {
-        final String query = "Apple";
-        final String packageName = "Bananas  Apples";
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
-                mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mCallable.call()).hasSize(1);
-    }
-
-    @Test
-    public void query_SpecialChar_MatchesSecondWord() throws Exception {
-        final String query = "Apple";
-        final String packageName = "Bananas & Apples";
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
-                mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mCallable.call()).hasSize(1);
-    }
-
-    @Test
-    public void query_TabSeparated_MatchesSecondWord() throws Exception {
-        final String query = "Apple";
-        final String packageName = "Bananas\tApples";
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
-                mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mCallable.call()).hasSize(1);
-    }
-
-    @Test
-    public void query_LeadingNumber_MatchesWord() throws Exception {
-        final String query = "4";
-        final String packageName = "4Bananas";
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
-                mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mCallable.call()).hasSize(1);
-    }
-
-    @Test
-    public void query_FirstWordPrefixOfQuery_NoMatch() throws Exception {
-        final String query = "Bananass";
-        final String packageName = "Bananas Apples";
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
-                mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mCallable.call()).isEmpty();
-    }
-
-    @Test
-    public void query_QueryLongerThanAppName_NoMatch() throws Exception {
-        final String query = "BananasApples";
-        final String packageName = "Bananas";
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), anyInt()))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(0 /* uid */, packageName, 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
-                mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        assertThat(mCallable.call()).isEmpty();
-    }
-
-    @Test
-    public void query_appExistsInBothProfiles() throws Exception {
-        final String query = "carrot";
-        final String packageName = "carrot";
-        final int user1 = 0;
-        final int user2 = 10;
-        final int uid = 67672;
-        List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(user1, "user 1", 0));
-        infos.add(new UserInfo(user2, "user 2", UserInfo.FLAG_MANAGED_PROFILE));
-
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
-
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), eq(user1)))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(UserHandle.getUid(user1, uid) /* uid */,
-                                packageName, 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), eq(user2)))
-                .thenReturn(Arrays.asList(
-                        ApplicationTestUtils.buildInfo(UserHandle.getUid(user2, uid) /* uid */,
-                                packageName, 0 /* flags */,
-                                0 /* targetSdkVersion */)));
-
-        mCallable = new InstalledAppResultLoader.InstalledAppResultCallable(mContext,
-                mPackageManagerWrapper, query,
-                mSiteMapManager);
-
-        List<AppSearchResult> searchResults = (List<AppSearchResult>) mCallable.call();
-        assertThat(searchResults).hasSize(2);
-
-        Set<Integer> uidResults = searchResults.stream().map(result -> result.info.uid).collect(
-                Collectors.toSet());
-        assertThat(uidResults).containsExactly(
-                UserHandle.getUid(user1, uid),
-                UserHandle.getUid(user2, uid));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java b/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
deleted file mode 100644
index 1c5a67e..0000000
--- a/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.UserHandle;
-import android.view.LayoutInflater;
-import android.view.View;
-
-import com.android.settings.R;
-import com.android.settings.TestConfig;
-import com.android.settings.search.SearchResult.Builder;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class IntentSearchViewHolderTest {
-
-    private static final String TITLE = "title";
-    private static final String SUMMARY = "summary";
-    private static final int USER_ID = 10;
-    private static final String BADGED_LABEL = "work title";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private SearchFragment mFragment;
-    @Mock
-    private PackageManager mPackageManager;
-    private FakeFeatureFactory mFeatureFactory;
-    private IntentSearchViewHolder mHolder;
-    private Drawable mIcon;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mFeatureFactory = FakeFeatureFactory.setupForTest();
-
-        final Context context = RuntimeEnvironment.application;
-        final View view = LayoutInflater.from(context).inflate(R.layout.search_intent_item, null);
-        mHolder = new IntentSearchViewHolder(view);
-
-        mIcon = context.getDrawable(R.drawable.ic_search_24dp);
-        when(mFragment.getActivity().getPackageManager()).thenReturn(mPackageManager);
-    }
-
-    @Test
-    public void testConstructor_membersNotNull() {
-        assertThat(mHolder.titleView).isNotNull();
-        assertThat(mHolder.summaryView).isNotNull();
-        assertThat(mHolder.iconView).isNotNull();
-        assertThat(mHolder.breadcrumbView).isNotNull();
-    }
-
-    @Test
-    public void testBindViewElements_allUpdated() {
-        final SearchResult result = getSearchResult(TITLE, SUMMARY, mIcon);
-        mHolder.onBind(mFragment, result);
-        mHolder.itemView.performClick();
-
-        assertThat(mHolder.titleView.getText()).isEqualTo(TITLE);
-        assertThat(mHolder.summaryView.getText()).isEqualTo(SUMMARY);
-        assertThat(mHolder.iconView.getDrawable()).isEqualTo(mIcon);
-        assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(mHolder.breadcrumbView.getVisibility()).isEqualTo(View.GONE);
-
-        verify(mFragment).onSearchResultClicked(eq(mHolder), any(SearchResult.class));
-    }
-
-    @Test
-    public void testBindViewIcon_nullIcon_imageDrawableIsNull() {
-        final SearchResult result = getSearchResult(TITLE, SUMMARY, null);
-        mHolder.onBind(mFragment, result);
-
-        assertThat(mHolder.iconView.getDrawable()).isNull();
-    }
-
-    @Test
-    public void testBindViewElements_emptySummary_hideSummaryView() {
-        final SearchResult result = new Builder()
-                .setTitle(TITLE)
-                .setRank(1)
-                .setPayload(new ResultPayload(null))
-                .setIcon(mIcon)
-                .setStableId(1)
-                .build();
-
-        mHolder.onBind(mFragment, result);
-        assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void testBindViewElements_withBreadcrumb_shouldFormatBreadcrumb() {
-        final List<String> breadcrumbs = new ArrayList<>();
-        breadcrumbs.add("a");
-        breadcrumbs.add("b");
-        breadcrumbs.add("c");
-        final SearchResult result = new Builder()
-                .setTitle(TITLE)
-                .setRank(1)
-                .setPayload(new ResultPayload(null))
-                .addBreadcrumbs(breadcrumbs)
-                .setIcon(mIcon)
-                .setStableId(1)
-                .build();
-
-        mHolder.onBind(mFragment, result);
-        assertThat(mHolder.breadcrumbView.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(mHolder.breadcrumbView.getText()).isEqualTo("a > b > c");
-    }
-
-    @Test
-    public void testBindElements_placeholderSummary_visibilityIsGone() {
-        final String nonBreakingSpace = mContext.getString(R.string.summary_placeholder);
-        final SearchResult result = new Builder()
-                .setTitle(TITLE)
-                .setSummary(nonBreakingSpace)
-                .setPayload(new ResultPayload(null))
-                .setStableId(1)
-                .build();
-
-        mHolder.onBind(mFragment, result);
-
-        assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void testBindElements_dynamicSummary_visibilityIsGone() {
-        final String dynamicSummary = "%s";
-        final SearchResult result = new Builder()
-                .setTitle(TITLE)
-                .setSummary(dynamicSummary)
-                .setPayload(new ResultPayload(null))
-                .setStableId(1)
-                .build();
-
-        mHolder.onBind(mFragment, result);
-
-        assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void testBindViewElements_appSearchResult() {
-        mHolder = spy(mHolder);
-        doReturn(new ColorDrawable(0)).when(mHolder).getBadgedIcon(any(ApplicationInfo.class),
-                anyInt());
-        when(mPackageManager.getUserBadgedLabel(any(CharSequence.class),
-                eq(new UserHandle(USER_ID)))).thenReturn(BADGED_LABEL);
-
-        final SearchResult result = getAppSearchResult(
-                TITLE, SUMMARY, mIcon, getApplicationInfo(USER_ID, TITLE, mIcon));
-        mHolder.onBind(mFragment, result);
-        mHolder.itemView.performClick();
-
-        assertThat(mHolder.titleView.getText()).isEqualTo(TITLE);
-        assertThat(mHolder.summaryView.getText()).isEqualTo(SUMMARY);
-        assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(mHolder.breadcrumbView.getVisibility()).isEqualTo(View.GONE);
-        assertThat(mHolder.titleView.getContentDescription()).isEqualTo(BADGED_LABEL);
-
-        verify(mFragment).onSearchResultClicked(eq(mHolder), any(SearchResult.class));
-        verify(mFragment.getActivity()).startActivityAsUser(
-                any(Intent.class), eq(new UserHandle(USER_ID)));
-    }
-
-    @Test
-    public void testBindViewElements_validSubSettingIntent_shouldLaunch() {
-        final SearchResult result = getSearchResult(TITLE, SUMMARY, mIcon);
-        when(mPackageManager.queryIntentActivities(result.payload.getIntent(), 0 /* flags */))
-                .thenReturn(Arrays.asList(new ResolveInfo()));
-
-        mHolder.onBind(mFragment, result);
-        mHolder.itemView.performClick();
-
-        assertThat(mHolder.titleView.getText()).isEqualTo(TITLE);
-        assertThat(mHolder.summaryView.getText()).isEqualTo(SUMMARY);
-        assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.VISIBLE);
-        verify(mFragment).onSearchResultClicked(eq(mHolder), any(SearchResult.class));
-        verify(mFragment).startActivityForResult(result.payload.getIntent(),
-                IntentSearchViewHolder.REQUEST_CODE_NO_OP);
-    }
-
-    @Test
-    public void testBindViewElements_invalidSubSettingIntent_shouldNotLaunchAnything() {
-        final SearchResult result = getSearchResult(TITLE, SUMMARY, mIcon);
-        when(mPackageManager.queryIntentActivities(result.payload.getIntent(), 0 /* flags */))
-                .thenReturn(null);
-
-        mHolder.onBind(mFragment, result);
-        mHolder.itemView.performClick();
-
-        assertThat(mHolder.titleView.getText()).isEqualTo(TITLE);
-        assertThat(mHolder.summaryView.getText()).isEqualTo(SUMMARY);
-        assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.VISIBLE);
-        verify(mFragment).onSearchResultClicked(eq(mHolder), any(SearchResult.class));
-        verify(mFragment, never()).startActivityForResult(result.payload.getIntent(),
-                IntentSearchViewHolder.REQUEST_CODE_NO_OP);
-    }
-
-    private SearchResult getSearchResult(String title, String summary, Drawable icon) {
-        Builder builder = new Builder();
-        builder.setStableId(Objects.hash(title, summary, icon))
-                .setTitle(title)
-                .setSummary(summary)
-                .setRank(1)
-                .setPayload(new ResultPayload(
-                        new Intent().setComponent(new ComponentName("pkg", "class"))))
-                .addBreadcrumbs(new ArrayList<>())
-                .setStableId(1)
-                .setIcon(icon);
-
-        return builder.build();
-    }
-
-    private SearchResult getAppSearchResult(
-            String title, String summary, Drawable icon, ApplicationInfo applicationInfo) {
-        AppSearchResult.Builder builder = new AppSearchResult.Builder();
-        builder.setTitle(title)
-                .setSummary(summary)
-                .setRank(1)
-                .setPayload(new ResultPayload(
-                        new Intent().setComponent(new ComponentName("pkg", "class"))))
-                .addBreadcrumbs(new ArrayList<>())
-                .setIcon(icon);
-        builder.setAppInfo(applicationInfo);
-        return builder.build();
-    }
-
-    private ApplicationInfo getApplicationInfo(int userId, CharSequence appLabel, Drawable icon) {
-        ApplicationInfo applicationInfo = spy(new ApplicationInfo());
-        applicationInfo.uid = UserHandle.getUid(userId, 12345);
-        doReturn(icon).when(applicationInfo).loadIcon(any(PackageManager.class));
-        doReturn(appLabel).when(applicationInfo).loadLabel(any(PackageManager.class));
-        return applicationInfo;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/MockSearchResultLoader.java b/tests/robotests/src/com/android/settings/search/MockSearchResultLoader.java
deleted file mode 100644
index 6af258a..0000000
--- a/tests/robotests/src/com/android/settings/search/MockSearchResultLoader.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.android.settings.search;
-
-import android.content.Context;
-
-import com.android.settings.search.SearchResult;
-import com.android.settings.search.SearchResultLoader;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Mock loader to subvert the requirements of returning data while also driving the Loader
- * lifecycle.
- */
-public class MockSearchResultLoader extends SearchResultLoader {
-
-    public MockSearchResultLoader(Context context) {
-        super(context, "test");
-    }
-
-    @Override
-    public List<? extends SearchResult> loadInBackground() {
-        return new ArrayList<>();
-    }
-
-    @Override
-    protected void onDiscardResult(List<? extends SearchResult> result) {
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java
deleted file mode 100644
index 780a8a5d..0000000
--- a/tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.DatabaseTestUtils;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SavedQueryLoaderTest {
-
-    private Context mContext;
-    private SQLiteDatabase mDb;
-    private SavedQueryLoader mLoader;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mDb = IndexDatabaseHelper.getInstance(mContext).getWritableDatabase();
-        mLoader = new SavedQueryLoader(mContext);
-        setUpDb();
-    }
-
-    @After
-    public void cleanUp() {
-        DatabaseTestUtils.clearDb(mContext);
-    }
-
-    @Test
-    public void loadInBackground_shouldReturnSavedQueries() {
-        final List<? extends SearchResult> results = mLoader.loadInBackground();
-        assertThat(results.size()).isEqualTo(SavedQueryLoader.MAX_PROPOSED_SUGGESTIONS);
-        for (SearchResult result : results) {
-            assertThat(result.viewType).isEqualTo(ResultPayload.PayloadType.SAVED_QUERY);
-        }
-    }
-
-    private void setUpDb() {
-        final long now = System.currentTimeMillis();
-        for (int i = 0; i < SavedQueryLoader.MAX_PROPOSED_SUGGESTIONS + 2; i++) {
-            ContentValues values = new ContentValues();
-            values.put(IndexDatabaseHelper.SavedQueriesColumns.QUERY, String.valueOf(i));
-            values.put(IndexDatabaseHelper.SavedQueriesColumns.TIME_STAMP, now);
-            mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_SAVED_QUERIES, null, values);
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java
deleted file mode 100644
index 7421d1a..0000000
--- a/tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SavedQueryPayloadTest {
-
-    private SavedQueryPayload mPayload;
-
-    @Test
-    public void getType_shouldBeSavedQueryType() {
-        mPayload = new SavedQueryPayload("Test");
-        assertThat(mPayload.getType()).isEqualTo(ResultPayload.PayloadType.SAVED_QUERY);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java
deleted file mode 100644
index af8cfe4..0000000
--- a/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.DatabaseTestUtils;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SavedQueryRecorderAndRemoverTest {
-
-    private Context mContext;
-    private SavedQueryRecorder mRecorder;
-    private SavedQueryRemover mRemover;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-    }
-
-    @After
-    public void cleanUp() {
-        DatabaseTestUtils.clearDb(mContext);
-    }
-
-    @Test
-    public void canSaveAndRemoveQuery() {
-        final String query = "test";
-        mRecorder = new SavedQueryRecorder(mContext, query);
-        mRemover = new SavedQueryRemover(mContext);
-
-        // Record a new query and load all queries from DB
-        mRecorder.loadInBackground();
-        final SavedQueryLoader loader = new SavedQueryLoader(mContext);
-        List<? extends SearchResult> results = loader.loadInBackground();
-
-        // Should contain the newly recorded query
-        assertThat(results.size()).isEqualTo(1);
-        assertThat(results.get(0).title).isEqualTo(query);
-
-        // Remove the query and load all queries from DB
-        mRemover.loadInBackground();
-        results = loader.loadInBackground();
-
-        // Saved query list should be empty because it's removed.
-        assertThat(results).isEmpty();
-    }
-
-    @Test
-    public void canRemoveAllQueriesAtOnce() {
-        mRemover = new SavedQueryRemover(mContext);;
-
-        // Record a new query and load all queries from DB
-        new SavedQueryRecorder(mContext, "Test1").loadInBackground();
-        new SavedQueryRecorder(mContext, "Test2").loadInBackground();
-        final SavedQueryLoader loader = new SavedQueryLoader(mContext);
-        List<? extends SearchResult> results = loader.loadInBackground();
-        assertThat(results.size()).isEqualTo(2);
-
-        mRemover.loadInBackground();
-        results = loader.loadInBackground();
-
-        // Saved query list should be empty because it's removed.
-        assertThat(results).isEmpty();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java
deleted file mode 100644
index bb8f6d1..0000000
--- a/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-
-import com.android.settings.R;
-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 SavedQueryViewHolderTest {
-
-    @Mock
-    private SearchFragment mSearchFragment;
-    private Context mContext;
-    private SavedQueryViewHolder mHolder;
-    private View mView;
-    private View mTitleView;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mView = LayoutInflater.from(mContext)
-                .inflate(R.layout.search_saved_query_item, null);
-        mTitleView = mView.findViewById(android.R.id.title);
-        mHolder = new SavedQueryViewHolder(mView);
-    }
-
-    @Test
-    public void onBind_shouldBindClickCallback() {
-        final SearchResult result = mock(SearchResult.class);
-        mHolder.onBind(mSearchFragment, result);
-
-        mHolder.itemView.performClick();
-
-        verify(mSearchFragment).onSavedQueryClicked(nullable(CharSequence.class));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
index 4349ab4..9584e42 100644
--- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
@@ -18,19 +18,15 @@
 package com.android.settings.search;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
 import static org.robolectric.Shadows.shadowOf;
 
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Intent;
-import android.util.FeatureFlagUtils;
 import android.widget.Toolbar;
 
 import com.android.settings.TestConfig;
-import com.android.settings.core.FeatureFlags;
 import com.android.settings.dashboard.SiteMapManager;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
@@ -73,31 +69,10 @@
     }
 
     @Test
-    public void getDatabaseSearchLoader_shouldCleanupQuery() {
-        final String query = "  space ";
-
-        mProvider.getStaticSearchResultTask(mActivity, query);
-
-        verify(mProvider).cleanQuery(eq(query));
-    }
-
-    @Test
-    public void getInstalledAppSearchLoader_shouldCleanupQuery() {
-        final String query = "  space ";
-
-        mProvider.getInstalledAppSearchTask(mActivity, query);
-
-        verify(mProvider).cleanQuery(eq(query));
-    }
-
-    @Test
-    public void initSearchToolbar_searchV2_shouldInitWithOnClickListener() {
+    public void initSearchToolbar_shouldInitWithOnClickListener() {
         mProvider.initSearchToolbar(mActivity, null);
         // Should not crash.
 
-        SettingsShadowSystemProperties.set(
-                FeatureFlagUtils.FFLAG_PREFIX + FeatureFlags.SEARCH_V2,
-                "true");
         final Toolbar toolbar = new Toolbar(mActivity);
         mProvider.initSearchToolbar(mActivity, toolbar);
 
@@ -109,25 +84,6 @@
                 .isEqualTo("com.android.settings.action.SETTINGS_SEARCH");
     }
 
-    @Test
-    public void initSearchToolbar_searchV1_shouldInitWithOnClickListener() {
-        mProvider.initSearchToolbar(mActivity, null);
-        // Should not crash.
-
-        SettingsShadowSystemProperties.set(
-                FeatureFlagUtils.FFLAG_PREFIX + FeatureFlags.SEARCH_V2,
-                "false");
-        final Toolbar toolbar = new Toolbar(mActivity);
-        mProvider.initSearchToolbar(mActivity, toolbar);
-
-        toolbar.performClick();
-
-        final Intent launchIntent = shadowOf(mActivity).getNextStartedActivity();
-
-        assertThat(launchIntent.getComponent().getClassName())
-                .isEqualTo(SearchActivity.class.getName());
-    }
-
     @Test(expected = IllegalArgumentException.class)
     public void verifyLaunchSearchResultPageCaller_nullCaller_shouldCrash() {
         mProvider.verifyLaunchSearchResultPageCaller(mActivity, null /* caller */);
diff --git a/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java b/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
deleted file mode 100644
index f547fe8..0000000
--- a/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
+++ /dev/null
@@ -1,413 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.LoaderManager;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Pair;
-import android.view.View;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.TestConfig;
-import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
-import com.android.settings.testutils.DatabaseTestUtils;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentMatcher;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.android.controller.ActivityController;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH,
-        sdk = TestConfig.SDK_VERSION,
-        shadows = {
-                SettingsShadowResources.class,
-                SettingsShadowResources.SettingsShadowTheme.class,
-        })
-public class SearchFragmentTest {
-    @Mock
-    private SearchResultLoader mSearchResultLoader;
-    @Mock
-    private SavedQueryLoader mSavedQueryLoader;
-    @Mock
-    private SavedQueryController mSavedQueryController;
-    @Mock
-    private SearchResultsAdapter mSearchResultsAdapter;
-
-    private FakeFeatureFactory mFeatureFactory;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mFeatureFactory = FakeFeatureFactory.setupForTest();
-    }
-
-    @After
-    public void tearDown() {
-        DatabaseTestUtils.clearDb(RuntimeEnvironment.application);
-    }
-
-    @Test
-    public void screenRotate_shouldPersistQuery() {
-        when(mFeatureFactory.searchFeatureProvider
-                .getSearchResultLoader(any(Context.class), anyString()))
-                .thenReturn(new MockSearchResultLoader(RuntimeEnvironment.application));
-        when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
-                .thenReturn(mSavedQueryLoader);
-
-        final Bundle bundle = new Bundle();
-        final String testQuery = "test";
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content);
-
-        ReflectionHelpers.setField(fragment, "mShowingSavedQuery", false);
-        fragment.mQuery = testQuery;
-
-        activityController.saveInstanceState(bundle).pause().stop().destroy();
-
-        activityController = Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup(bundle);
-
-        assertThat(fragment.mQuery).isEqualTo(testQuery);
-    }
-
-    @Test
-    public void screenRotateEmptyString_ShouldNotCrash() {
-        when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
-                .thenReturn(mSavedQueryLoader);
-
-        final Bundle bundle = new Bundle();
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content);
-        when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
-                .thenReturn(true);
-
-        fragment.mQuery = "";
-
-        activityController.saveInstanceState(bundle).pause().stop().destroy();
-
-        activityController = Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup(bundle);
-
-        verify(mFeatureFactory.searchFeatureProvider, never())
-                .getStaticSearchResultTask(any(Context.class), anyString());
-        verify(mFeatureFactory.searchFeatureProvider, never())
-                .getInstalledAppSearchTask(any(Context.class), anyString());
-    }
-
-    @Test
-    public void queryTextChange_shouldTriggerLoader() {
-        when(mFeatureFactory.searchFeatureProvider
-                .getSearchResultLoader(any(Context.class), anyString()))
-                .thenReturn(mSearchResultLoader);
-        when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
-                .thenReturn(mSavedQueryLoader);
-
-        final String testQuery = "test";
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content);
-        when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
-                .thenReturn(true);
-
-        fragment.onQueryTextChange(testQuery);
-        activityController.get().onBackPressed();
-
-        activityController.pause().stop().destroy();
-
-        verify(mFeatureFactory.metricsFeatureProvider, never()).action(
-                any(Context.class),
-                eq(MetricsProto.MetricsEvent.ACTION_LEAVE_SEARCH_RESULT_WITHOUT_QUERY));
-        verify(mFeatureFactory.searchFeatureProvider)
-                .getSearchResultLoader(any(Context.class), anyString());
-    }
-
-    @Test
-    public void onSearchResultsDisplayed_noResult_shouldShowNoResultView() {
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = spy((SearchFragment) activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content));
-        fragment.onSearchResultsDisplayed(0 /* count */);
-
-        assertThat(fragment.mNoResultsView.getVisibility()).isEqualTo(View.VISIBLE);
-        verify(mFeatureFactory.metricsFeatureProvider).visible(
-                any(Context.class),
-                anyInt(),
-                eq(MetricsProto.MetricsEvent.SETTINGS_SEARCH_NO_RESULT));
-        verify(mFeatureFactory.metricsFeatureProvider).action(
-                any(VisibilityLoggerMixin.class),
-                eq(MetricsProto.MetricsEvent.ACTION_SEARCH_RESULTS),
-                eq(1));
-    }
-
-    @Test
-    public void queryTextChangeToEmpty_shouldLoadSavedQueryAndNotInitializeSearch() {
-        when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
-                .thenReturn(mSavedQueryLoader);
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = spy((SearchFragment) activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content));
-        when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
-                .thenReturn(true);
-        ReflectionHelpers.setField(fragment, "mSavedQueryController", mSavedQueryController);
-        ReflectionHelpers.setField(fragment, "mSearchAdapter", mSearchResultsAdapter);
-        fragment.mQuery = "123";
-
-        fragment.onQueryTextChange("");
-
-        verify(mFeatureFactory.searchFeatureProvider, never())
-                .getStaticSearchResultTask(any(Context.class), anyString());
-        verify(mFeatureFactory.searchFeatureProvider, never())
-                .getInstalledAppSearchTask(any(Context.class), anyString());
-        verify(mSavedQueryController).loadSavedQueries();
-    }
-
-    @Test
-    public void updateIndex_TriggerOnCreate() {
-        when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
-                .thenReturn(mSavedQueryLoader);
-
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content);
-        when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
-                .thenReturn(true);
-
-        fragment.onAttach(null);
-        verify(mFeatureFactory.searchFeatureProvider).updateIndexAsync(any(Context.class),
-                any(IndexingCallback.class));
-    }
-
-    @Test
-    public void whenNoQuery_HideFeedbackIsCalled() {
-        when(mFeatureFactory.searchFeatureProvider
-                .getSearchResultLoader(any(Context.class), anyString()))
-                .thenReturn(new MockSearchResultLoader(RuntimeEnvironment.application));
-        when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
-                .thenReturn(mSavedQueryLoader);
-
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = (SearchFragment) spy(activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content));
-        when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
-                .thenReturn(true);
-        when(fragment.getLoaderManager()).thenReturn(mock(LoaderManager.class));
-
-        fragment.onQueryTextChange("");
-        Robolectric.flushForegroundThreadScheduler();
-
-        verify(mFeatureFactory.searchFeatureProvider).hideFeedbackButton();
-    }
-
-    @Test
-    public void onLoadFinished_ShowsFeedback() {
-        when(mFeatureFactory.searchFeatureProvider
-                .getSearchResultLoader(any(Context.class), anyString()))
-                .thenReturn(new MockSearchResultLoader(RuntimeEnvironment.application));
-        when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
-                .thenReturn(mSavedQueryLoader);
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content);
-        when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
-                .thenReturn(true);
-
-        fragment.onQueryTextChange("non-empty");
-        Robolectric.flushForegroundThreadScheduler();
-
-        verify(mFeatureFactory.searchFeatureProvider).showFeedbackButton(any(SearchFragment.class),
-                any(View.class));
-    }
-
-    @Test
-    public void preIndexingFinished_isIndexingFinishedFlag_isFalse() {
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content);
-
-        when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
-                .thenReturn(false);
-    }
-
-    @Test
-    public void onIndexingFinished_notShowingSavedQuery_initLoaders() {
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = (SearchFragment) spy(activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content));
-        final LoaderManager loaderManager = mock(LoaderManager.class);
-        when(fragment.getLoaderManager()).thenReturn(loaderManager);
-        fragment.mShowingSavedQuery = false;
-        fragment.mQuery = null;
-
-        fragment.onIndexingFinished();
-
-        verify(loaderManager).initLoader(eq(SearchFragment.SearchLoaderId.SEARCH_RESULT),
-                eq(null), any(LoaderManager.LoaderCallbacks.class));
-    }
-
-    @Test
-    public void onIndexingFinished_showingSavedQuery_loadsSavedQueries() {
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = (SearchFragment) spy(activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content));
-        fragment.mShowingSavedQuery = true;
-        ReflectionHelpers.setField(fragment, "mSavedQueryController", mSavedQueryController);
-
-        fragment.onIndexingFinished();
-
-        verify(fragment.mSavedQueryController).loadSavedQueries();
-    }
-
-    @Test
-    public void onIndexingFinished_noActivity_shouldNotCrash() {
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = (SearchFragment) spy(activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content));
-        when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
-                .thenReturn(true);
-        fragment.mQuery = "bright";
-        ReflectionHelpers.setField(fragment, "mLoaderManager", null);
-        ReflectionHelpers.setField(fragment, "mHost", null);
-
-        fragment.onIndexingFinished();
-        // no crash
-    }
-
-    @Test
-    public void onSearchResultClicked_shouldLogResultMeta() {
-        SearchFragment fragment = new SearchFragment();
-        ReflectionHelpers.setField(fragment, "mMetricsFeatureProvider",
-                mFeatureFactory.metricsFeatureProvider);
-        ReflectionHelpers.setField(fragment, "mSearchFeatureProvider",
-                mFeatureFactory.searchFeatureProvider);
-        ReflectionHelpers.setField(fragment, "mSearchAdapter", mock(SearchResultsAdapter.class));
-        fragment.mSavedQueryController = mock(SavedQueryController.class);
-
-        // Should log result name, result count, clicked rank, etc.
-        final SearchViewHolder resultViewHolder = mock(SearchViewHolder.class);
-        when(resultViewHolder.getClickActionMetricName())
-                .thenReturn(MetricsProto.MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_RESULT);
-        ResultPayload payLoad = new ResultPayload(
-                (new Intent()).putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT, "test_setting"));
-        SearchResult searchResult = new SearchResult.Builder()
-                .setStableId(payLoad.hashCode())
-                .setPayload(payLoad)
-                .setTitle("setting_title")
-                .build();
-        fragment.onSearchResultClicked(resultViewHolder, searchResult);
-
-        verify(mFeatureFactory.metricsFeatureProvider).action(
-                nullable(Context.class),
-                eq(MetricsProto.MetricsEvent.ACTION_CLICK_SETTINGS_SEARCH_RESULT),
-                eq("test_setting"),
-                argThat(pairMatches(MetricsProto.MetricsEvent.FIELD_SETTINGS_SEARCH_RESULT_COUNT)),
-                argThat(pairMatches(MetricsProto.MetricsEvent.FIELD_SETTINGS_SEARCH_RESULT_RANK)),
-                argThat(pairMatches(MetricsProto.MetricsEvent.FIELD_SETTINGS_SEARCH_QUERY_LENGTH)));
-        verify(mFeatureFactory.searchFeatureProvider).searchResultClicked(nullable(Context.class),
-                nullable(String.class), eq(searchResult));
-    }
-
-    @Test
-    public void onResume_shouldCallSearchRankingWarmupIfSmartSearchRankingEnabled() {
-        when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(any(Context.class)))
-                .thenReturn(true);
-
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content);
-
-        verify(mFeatureFactory.searchFeatureProvider)
-                .searchRankingWarmup(any(Context.class));
-    }
-
-    @Test
-    public void onResume_shouldNotCallSearchRankingWarmupIfSmartSearchRankingDisabled() {
-        when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(any(Context.class)))
-                .thenReturn(false);
-
-        ActivityController<SearchActivity> activityController =
-                Robolectric.buildActivity(SearchActivity.class);
-        activityController.setup();
-        SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
-                .findFragmentById(R.id.main_content);
-
-        verify(mFeatureFactory.searchFeatureProvider, never())
-                .searchRankingWarmup(any(Context.class));
-    }
-
-    private ArgumentMatcher<Pair<Integer, Object>> pairMatches(int tag) {
-        return pair -> pair.first == tag;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/SearchResultAggregatorTest.java b/tests/robotests/src/com/android/settings/search/SearchResultAggregatorTest.java
deleted file mode 100644
index 27fcd6a..0000000
--- a/tests/robotests/src/com/android/settings/search/SearchResultAggregatorTest.java
+++ /dev/null
@@ -1,269 +0,0 @@
-package com.android.settings.search;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.Intent;
-
-import com.android.settings.TestConfig;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SearchResultAggregatorTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-
-    private FakeFeatureFactory mFeatureFactory;
-
-    private SearchResultAggregator mAggregator;
-
-    @Mock
-    private DatabaseResultLoader mStaticTask;
-    @Mock
-    private InstalledAppResultLoader mAppTask;
-    @Mock
-    private InputDeviceResultLoader mInputTask;
-    @Mock
-    private AccessibilityServiceResultLoader mMAccessibilityTask;
-    @Mock
-    private ExecutorService mService;
-
-
-    private String[] DB_TITLES = {"static_one", "static_two"};
-    private String[] INPUT_TITLES = {"input_one", "input_two"};
-    private String[] ACCESS_TITLES = {"access_one", "access_two"};
-    private String[] APP_TITLES = {"app_one", "app_two"};
-
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        mAggregator = spy(SearchResultAggregator.getInstance());
-        mFeatureFactory = FakeFeatureFactory.setupForTest();
-
-        // Return mock loaders from feature provider
-        when(mFeatureFactory.searchFeatureProvider.getStaticSearchResultTask(any(Context.class),
-                anyString())).thenReturn(mStaticTask);
-        when(mFeatureFactory.searchFeatureProvider.getInstalledAppSearchTask(any(Context.class),
-                anyString())).thenReturn(mAppTask);
-        when(mFeatureFactory.searchFeatureProvider.getInputDeviceResultTask(any(Context.class),
-                anyString())).thenReturn(mInputTask);
-        when(mFeatureFactory.searchFeatureProvider.getAccessibilityServiceResultTask(
-                any(Context.class),
-                anyString())).thenReturn(mMAccessibilityTask);
-        when(mFeatureFactory.searchFeatureProvider.getExecutorService()).thenReturn(mService);
-
-        // Return fake data from the loaders
-        List<? extends SearchResult> dbResults = getDummyDbResults();
-        doReturn(dbResults).when(mStaticTask).get(anyLong(), any(TimeUnit.class));
-
-        List<? extends SearchResult> appResults = getDummyAppResults();
-        doReturn(appResults).when(mAppTask).get(anyLong(), any(TimeUnit.class));
-
-        List<? extends SearchResult> inputResults = getDummyInputDeviceResults();
-        doReturn(inputResults).when(mInputTask).get(anyLong(), any(TimeUnit.class));
-
-        List<? extends SearchResult> accessResults = getDummyAccessibilityResults();
-        doReturn(accessResults).when(mMAccessibilityTask).get(anyLong(), any(TimeUnit.class));
-    }
-
-    @Test
-    public void testStaticResults_mergedProperly() {
-        when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(mContext))
-                .thenReturn(false);
-
-        List<? extends SearchResult> results = mAggregator.fetchResults(mContext, "test");
-
-        assertThat(results).hasSize(8);
-        assertThat(results.get(0).title).isEqualTo(DB_TITLES[0]);
-        assertThat(results.get(1).title).isEqualTo(DB_TITLES[1]);
-        assertThat(results.get(2).title).isEqualTo(APP_TITLES[0]);
-        assertThat(results.get(3).title).isEqualTo(ACCESS_TITLES[0]);
-        assertThat(results.get(4).title).isEqualTo(INPUT_TITLES[0]);
-        assertThat(results.get(5).title).isEqualTo(APP_TITLES[1]);
-        assertThat(results.get(6).title).isEqualTo(ACCESS_TITLES[1]);
-        assertThat(results.get(7).title).isEqualTo(INPUT_TITLES[1]);
-    }
-
-    @Test
-    public void testStaticRanking_staticThrowsException_dbResultsAreMissing() throws Exception {
-        when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(mContext))
-                .thenReturn(false);
-        when(mStaticTask.get(anyLong(), any(TimeUnit.class))).thenThrow(new InterruptedException());
-
-        List<? extends SearchResult> results = mAggregator.fetchResults(mContext, "test");
-
-        assertThat(results).hasSize(6);
-        assertThat(results.get(0).title).isEqualTo(APP_TITLES[0]);
-        assertThat(results.get(1).title).isEqualTo(ACCESS_TITLES[0]);
-        assertThat(results.get(2).title).isEqualTo(INPUT_TITLES[0]);
-        assertThat(results.get(3).title).isEqualTo(APP_TITLES[1]);
-        assertThat(results.get(4).title).isEqualTo(ACCESS_TITLES[1]);
-        assertThat(results.get(5).title).isEqualTo(INPUT_TITLES[1]);
-    }
-
-    @Test
-    public void testStaticRanking_appsThrowException_appResultsAreMissing() throws Exception {
-        when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(mContext))
-                .thenReturn(false);
-        when(mAppTask.get(anyLong(), any(TimeUnit.class))).thenThrow(new InterruptedException());
-
-        List<? extends SearchResult> results = mAggregator.fetchResults(mContext, "test");
-
-        assertThat(results).hasSize(6);
-        assertThat(results.get(0).title).isEqualTo(DB_TITLES[0]);
-        assertThat(results.get(1).title).isEqualTo(DB_TITLES[1]);
-        assertThat(results.get(2).title).isEqualTo(ACCESS_TITLES[0]);
-        assertThat(results.get(3).title).isEqualTo(INPUT_TITLES[0]);
-        assertThat(results.get(4).title).isEqualTo(ACCESS_TITLES[1]);
-        assertThat(results.get(5).title).isEqualTo(INPUT_TITLES[1]);
-    }
-
-    @Test
-    public void testStaticRanking_inputThrowException_inputResultsAreMissing() throws Exception {
-        when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(mContext))
-                .thenReturn(false);
-        when(mInputTask.get(anyLong(), any(TimeUnit.class))).thenThrow(new InterruptedException());
-
-        List<? extends SearchResult> results = mAggregator.fetchResults(mContext, "test");
-
-        assertThat(results).hasSize(6);
-        assertThat(results.get(0).title).isEqualTo(DB_TITLES[0]);
-        assertThat(results.get(1).title).isEqualTo(DB_TITLES[1]);
-        assertThat(results.get(2).title).isEqualTo(APP_TITLES[0]);
-        assertThat(results.get(3).title).isEqualTo(ACCESS_TITLES[0]);
-        assertThat(results.get(4).title).isEqualTo(APP_TITLES[1]);
-        assertThat(results.get(5).title).isEqualTo(ACCESS_TITLES[1]);
-    }
-
-    @Test
-    public void testStaticRanking_accessThrowException_accessResultsAreMissing() throws Exception {
-        when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(mContext))
-                .thenReturn(false);
-        when(mMAccessibilityTask.get(anyLong(), any(TimeUnit.class))).thenThrow(
-                new InterruptedException());
-
-        List<? extends SearchResult> results = mAggregator.fetchResults(mContext, "test");
-
-        assertThat(results).hasSize(6);
-        assertThat(results.get(0).title).isEqualTo(DB_TITLES[0]);
-        assertThat(results.get(1).title).isEqualTo(DB_TITLES[1]);
-        assertThat(results.get(2).title).isEqualTo(APP_TITLES[0]);
-        assertThat(results.get(3).title).isEqualTo(INPUT_TITLES[0]);
-        assertThat(results.get(4).title).isEqualTo(APP_TITLES[1]);
-        assertThat(results.get(5).title).isEqualTo(INPUT_TITLES[1]);
-    }
-
-    @Test
-    public void testDynamicRanking_sortsWithDynamicRanking() {
-        when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(
-                true);
-
-        List<? extends SearchResult> results = mAggregator.fetchResults(mContext, "test");
-
-        assertThat(results).hasSize(8);
-        assertThat(results.get(0).title).isEqualTo(DB_TITLES[0]);
-        assertThat(results.get(1).title).isEqualTo(DB_TITLES[1]);
-        assertThat(results.get(2).title).isEqualTo(APP_TITLES[0]);
-        assertThat(results.get(3).title).isEqualTo(ACCESS_TITLES[0]);
-        assertThat(results.get(4).title).isEqualTo(INPUT_TITLES[0]);
-        assertThat(results.get(5).title).isEqualTo(APP_TITLES[1]);
-        assertThat(results.get(6).title).isEqualTo(ACCESS_TITLES[1]);
-        assertThat(results.get(7).title).isEqualTo(INPUT_TITLES[1]);
-    }
-
-    private List<? extends SearchResult> getDummyDbResults() {
-        List<SearchResult> results = new ArrayList<>();
-        ResultPayload payload = new ResultPayload(new Intent());
-        SearchResult.Builder builder = new SearchResult.Builder();
-        builder.setPayload(payload)
-                .setTitle(DB_TITLES[0])
-                .setRank(1)
-                .setStableId(Objects.hash(DB_TITLES[0], "db"));
-        results.add(builder.build());
-
-        builder.setTitle(DB_TITLES[1])
-                .setRank(2)
-                .setStableId(Objects.hash(DB_TITLES[1], "db"));
-        results.add(builder.build());
-
-        return results;
-    }
-
-    private List<? extends SearchResult> getDummyAppResults() {
-        List<AppSearchResult> results = new ArrayList<>();
-        ResultPayload payload = new ResultPayload(new Intent());
-        AppSearchResult.Builder builder = new AppSearchResult.Builder();
-        builder.setPayload(payload)
-                .setTitle(APP_TITLES[0])
-                .setRank(1)
-                .setStableId(Objects.hash(APP_TITLES[0], "app"));
-        results.add(builder.build());
-
-        builder.setTitle(APP_TITLES[1])
-                .setRank(2)
-                .setStableId(Objects.hash(APP_TITLES[1], "app"));
-        results.add(builder.build());
-
-        return results;
-    }
-
-    public List<? extends SearchResult> getDummyInputDeviceResults() {
-        List<SearchResult> results = new ArrayList<>();
-        ResultPayload payload = new ResultPayload(new Intent());
-        AppSearchResult.Builder builder = new AppSearchResult.Builder();
-        builder.setPayload(payload)
-                .setTitle(INPUT_TITLES[0])
-                .setRank(1)
-                .setStableId(Objects.hash(INPUT_TITLES[0], "app"));
-        results.add(builder.build());
-
-        builder.setTitle(INPUT_TITLES[1])
-                .setRank(2)
-                .setStableId(Objects.hash(INPUT_TITLES[1], "app"));
-        results.add(builder.build());
-
-        return results;
-    }
-
-    public List<? extends SearchResult> getDummyAccessibilityResults() {
-        List<SearchResult> results = new ArrayList<>();
-        ResultPayload payload = new ResultPayload(new Intent());
-        AppSearchResult.Builder builder = new AppSearchResult.Builder();
-        builder.setPayload(payload)
-                .setTitle(ACCESS_TITLES[0])
-                .setRank(1)
-                .setStableId(Objects.hash(ACCESS_TITLES[0], "app"));
-        results.add(builder.build());
-
-        builder.setTitle(ACCESS_TITLES[1])
-                .setRank(2)
-                .setStableId(Objects.hash(ACCESS_TITLES[1], "app"));
-        results.add(builder.build());
-
-        return results;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java b/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java
deleted file mode 100644
index 4baf8d2..0000000
--- a/tests/robotests/src/com/android/settings/search/SearchResultsAdapterTest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-
-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.Robolectric;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SearchResultsAdapterTest {
-
-    @Mock
-    private SearchFragment mFragment;
-    @Mock
-    private SearchFeatureProvider mSearchFeatureProvider;
-    @Mock
-    private Context mMockContext;
-    private SearchResultsAdapter mAdapter;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = Robolectric.buildActivity(Activity.class).get();
-        when(mFragment.getContext()).thenReturn(mMockContext);
-        when(mMockContext.getApplicationContext()).thenReturn(mContext);
-        when(mSearchFeatureProvider.smartSearchRankingTimeoutMs(any(Context.class)))
-                .thenReturn(300L);
-        mAdapter = new SearchResultsAdapter(mFragment);
-    }
-
-    @Test
-    public void testNoResultsAdded_emptyListReturned() {
-        List<SearchResult> updatedResults = mAdapter.getSearchResults();
-        assertThat(updatedResults).isEmpty();
-    }
-
-    @Test
-    public void testCreateViewHolder_returnsIntentResult() {
-        ViewGroup group = new FrameLayout(mContext);
-        SearchViewHolder view = mAdapter.onCreateViewHolder(group,
-                ResultPayload.PayloadType.INTENT);
-        assertThat(view).isInstanceOf(IntentSearchViewHolder.class);
-    }
-
-    @Test
-    public void testCreateViewHolder_returnsIntentSwitchResult() {
-        // TODO (b/62807132) test for InlineResult
-        ViewGroup group = new FrameLayout(mContext);
-        SearchViewHolder view = mAdapter.onCreateViewHolder(group,
-                ResultPayload.PayloadType.INLINE_SWITCH);
-        assertThat(view).isInstanceOf(IntentSearchViewHolder.class);
-    }
-
-    @Test
-    public void testPostSearchResults_addsDataAndDisplays() {
-        List<SearchResult> results = getDummyDbResults();
-
-        mAdapter.postSearchResults(results);
-
-        assertThat(mAdapter.getSearchResults()).containsExactlyElementsIn(results);
-        verify(mFragment).onSearchResultsDisplayed(anyInt());
-    }
-
-    private List<SearchResult> getDummyDbResults() {
-        List<SearchResult> results = new ArrayList<>();
-        ResultPayload payload = new ResultPayload(new Intent());
-        SearchResult.Builder builder = new SearchResult.Builder();
-        builder.setPayload(payload)
-                .setTitle("one")
-                .setRank(1)
-                .setStableId(Objects.hash("one", "db"));
-        results.add(builder.build());
-
-        builder.setTitle("two")
-                .setRank(3)
-                .setStableId(Objects.hash("two", "db"));
-        results.add(builder.build());
-
-        builder.setTitle("three")
-                .setRank(6)
-                .setStableId(Objects.hash("three", "db"));
-        results.add(builder.build());
-
-        return results;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/StaticSearchResultFutureTaskTest.java b/tests/robotests/src/com/android/settings/search/StaticSearchResultFutureTaskTest.java
deleted file mode 100644
index b1494e4..0000000
--- a/tests/robotests/src/com/android/settings/search/StaticSearchResultFutureTaskTest.java
+++ /dev/null
@@ -1,513 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.database.sqlite.SQLiteDatabase;
-import android.util.Pair;
-
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.search.DatabaseResultLoader.StaticSearchResultCallable;
-import com.android.settings.search.indexing.IndexData;
-import com.android.settings.testutils.DatabaseTestUtils;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class StaticSearchResultFutureTaskTest {
-
-    @Mock
-    private SiteMapManager mSiteMapManager;
-    @Mock
-    private ExecutorService mService;
-    private Context mContext;
-
-    SQLiteDatabase mDb;
-
-    FakeFeatureFactory mFeatureFactory;
-
-    private final String[] STATIC_TITLES = {"static one", "static two", "static three"};
-    private final int[] STABLE_IDS =
-            {"id_one".hashCode(), "id_two".hashCode(), "id_three".hashCode()};
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mFeatureFactory = FakeFeatureFactory.setupForTest();
-        when(mFeatureFactory.searchFeatureProvider.getExecutorService()).thenReturn(mService);
-        when(mFeatureFactory.searchFeatureProvider.getSiteMapManager())
-                .thenReturn(mSiteMapManager);
-        mDb = IndexDatabaseHelper.getInstance(mContext).getWritableDatabase();
-        setUpDb();
-    }
-
-    @After
-    public void cleanUp() {
-        DatabaseTestUtils.clearDb(mContext);
-    }
-
-    @Test
-    public void testMatchTitle() throws Exception {
-        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "title",
-                mSiteMapManager);
-
-        assertThat(loader.call()).hasSize(2);
-        verify(mSiteMapManager, times(2)).buildBreadCrumb(eq(mContext), anyString(), anyString());
-    }
-
-    @Test
-    public void testMatchSummary() throws Exception {
-        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "summary",
-                mSiteMapManager);
-
-        assertThat(loader.call()).hasSize(2);
-    }
-
-    @Test
-    public void testMatchKeywords() throws Exception {
-        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "keywords",
-                mSiteMapManager);
-
-        assertThat(loader.call()).hasSize(2);
-    }
-
-    @Test
-    public void testMatchEntries() throws Exception {
-        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "entries",
-                mSiteMapManager);
-
-        assertThat(loader.call()).hasSize(2);
-    }
-
-    @Test
-    public void testSpecialCaseWord_matchesNonPrefix() throws Exception {
-        insertSpecialCase("Data usage");
-
-        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "usage",
-                mSiteMapManager);
-
-        assertThat(loader.call()).hasSize(1);
-    }
-
-    @Test
-    public void testSpecialCaseDash_matchesWordNoDash() throws Exception {
-        insertSpecialCase("wi-fi calling");
-
-        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "wifi",
-                mSiteMapManager);
-
-        assertThat(loader.call()).hasSize(1);
-    }
-
-    @Test
-    public void testSpecialCaseDash_matchesWordWithDash() throws Exception {
-        insertSpecialCase("priorités seulment");
-
-        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "priorités",
-                mSiteMapManager);
-
-        assertThat(loader.call()).hasSize(1);
-    }
-
-    @Test
-    public void testSpecialCaseDash_matchesWordWithoutDash() throws Exception {
-        insertSpecialCase("priorités seulment");
-
-        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "priorites",
-                mSiteMapManager);
-
-        assertThat(loader.call()).hasSize(1);
-    }
-
-    @Test
-    public void testSpecialCaseDash_matchesEntireQueryWithoutDash() throws Exception {
-        insertSpecialCase("wi-fi calling");
-
-        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "wifi calling",
-                mSiteMapManager);
-
-        assertThat(loader.call()).hasSize(1);
-    }
-
-    @Test
-    public void testSpecialCasePrefix_matchesPrefixOfEntry() throws Exception {
-        insertSpecialCase("Photos");
-
-        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "pho",
-                mSiteMapManager);
-
-        assertThat(loader.call()).hasSize(1);
-    }
-
-    @Test
-    public void testSpecialCasePrefix_DoesNotMatchNonPrefixSubstring() throws Exception {
-        insertSpecialCase("Photos");
-
-        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "hot",
-                mSiteMapManager);
-
-        assertThat(loader.call()).hasSize(0);
-    }
-
-    @Test
-    public void testSpecialCaseMultiWordPrefix_matchesPrefixOfEntry() throws Exception {
-        insertSpecialCase("Apps Notifications");
-
-        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "Apps",
-                mSiteMapManager);
-
-        assertThat(loader.call()).hasSize(1);
-    }
-
-    @Test
-    public void testSpecialCaseMultiWordPrefix_matchesSecondWordPrefixOfEntry() throws Exception {
-        insertSpecialCase("Apps Notifications");
-
-        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "Not",
-                mSiteMapManager);
-
-        assertThat(loader.call()).hasSize(1);
-    }
-
-    @Test
-    public void testSpecialCaseMultiWordPrefix_DoesNotMatchMatchesPrefixOfFirstEntry()
-            throws Exception {
-        insertSpecialCase("Apps Notifications");
-
-        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "pp",
-                mSiteMapManager);
-
-        assertThat(loader.call()).hasSize(0);
-    }
-
-    @Test
-    public void testSpecialCaseMultiWordPrefix_DoesNotMatchMatchesPrefixOfSecondEntry()
-            throws Exception {
-        insertSpecialCase("Apps Notifications");
-
-        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "tion",
-                mSiteMapManager);
-
-        assertThat(loader.call()).hasSize(0);
-    }
-
-    @Test
-    public void testSpecialCaseMultiWordPrefixWithSpecial_matchesPrefixOfEntry() throws
-            Exception {
-        insertSpecialCase("Apps & Notifications");
-
-        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "App",
-                mSiteMapManager);
-
-        assertThat(loader.call()).hasSize(1);
-    }
-
-    @Test
-    public void testSpecialCaseMultiWordPrefixWithSpecial_matchesPrefixOfSecondEntry()
-            throws Exception {
-        insertSpecialCase("Apps & Notifications");
-
-        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "No",
-                mSiteMapManager);
-
-        assertThat(loader.call()).hasSize(1);
-    }
-
-    @Test
-    public void testResultMatchedByMultipleQueries_duplicatesRemoved() throws Exception {
-        String key = "durr";
-        insertSameValueAllFieldsCase(key);
-
-        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, key, null);
-
-        assertThat(loader.call()).hasSize(1);
-    }
-
-    @Test
-    public void testSpecialCaseTwoWords_multipleResults() throws Exception {
-        final String caseOne = "Apple pear";
-        final String caseTwo = "Banana apple";
-        insertSpecialCase(caseOne);
-        insertSpecialCase(caseTwo);
-        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "App", null);
-
-        List<? extends SearchResult> results = loader.call();
-
-        Set<String> actualTitles = new HashSet<>();
-        for (SearchResult result : results) {
-            actualTitles.add(result.title.toString());
-        }
-        assertThat(actualTitles).containsAllOf(caseOne, caseTwo);
-    }
-
-    @Test
-    public void testGetRankingScoreByStableId_sortedDynamically() throws Exception {
-        FutureTask<List<Pair<String, Float>>> task = mock(FutureTask.class);
-        when(task.get(anyLong(), any(TimeUnit.class))).thenReturn(getDummyRankingScores());
-        when(mFeatureFactory.searchFeatureProvider.getRankerTask(any(Context.class),
-                anyString())).thenReturn(task);
-        when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(
-                true);
-
-        insertSpecialCase(STATIC_TITLES[0], STABLE_IDS[0]);
-        insertSpecialCase(STATIC_TITLES[1], STABLE_IDS[1]);
-        insertSpecialCase(STATIC_TITLES[2], STABLE_IDS[2]);
-
-        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "Static",
-                null);
-
-        List<? extends SearchResult> results = loader.call();
-
-        assertThat(results.get(0).title).isEqualTo(STATIC_TITLES[2]);
-        assertThat(results.get(1).title).isEqualTo(STATIC_TITLES[0]);
-        assertThat(results.get(2).title).isEqualTo(STATIC_TITLES[1]);
-    }
-
-    @Test
-    public void testGetRankingScoreByStableId_scoresTimeout_sortedStatically() throws Exception {
-        Callable<List<Pair<String, Float>>> callable = mock(Callable.class);
-        when(callable.call()).thenThrow(new TimeoutException());
-        FutureTask<List<Pair<String, Float>>> task = new FutureTask<>(callable);
-        when(mFeatureFactory.searchFeatureProvider.isSmartSearchRankingEnabled(any())).thenReturn(
-                true);
-        when(mFeatureFactory.searchFeatureProvider.getRankerTask(any(Context.class),
-                anyString())).thenReturn(task);
-        insertSpecialCase("title", STABLE_IDS[0]);
-
-        StaticSearchResultCallable loader = new StaticSearchResultCallable(mContext, "title", null);
-
-        List<? extends SearchResult> results = loader.call();
-        assertThat(results.get(0).title).isEqualTo("title");
-        assertThat(results.get(1).title).isEqualTo("alpha_title");
-        assertThat(results.get(2).title).isEqualTo("bravo_title");
-    }
-
-    private void insertSpecialCase(String specialCase) {
-        insertSpecialCase(specialCase, specialCase.hashCode());
-    }
-
-    private void insertSpecialCase(String specialCase, int docId) {
-        String normalized = IndexData.normalizeHyphen(specialCase);
-        normalized = IndexData.normalizeString(normalized);
-        final ResultPayload payload = new ResultPayload(new Intent());
-
-        ContentValues values = new ContentValues();
-        values.put(IndexDatabaseHelper.IndexColumns.DOCID, docId);
-        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, specialCase);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, normalized);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "");
-        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
-                "com.android.settings.gestures.GestureSettings");
-        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, normalized.hashCode());
-        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, ResultPayloadUtils.marshall(payload));
-
-        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
-    }
-
-    private void setUpDb() {
-        final byte[] payload = ResultPayloadUtils.marshall(new ResultPayload(new Intent()));
-
-        ContentValues values = new ContentValues();
-        values.put(IndexDatabaseHelper.IndexColumns.DOCID, 1);
-        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, "alpha_title");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, "alpha title");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "alpha_summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "alpha summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "alpha_summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "alpha summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "alpha entries");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "alpha keywords");
-        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
-                "com.android.settings.gestures.GestureSettings");
-        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power_0");
-        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, payload);
-
-        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
-
-        values = new ContentValues();
-        values.put(IndexDatabaseHelper.IndexColumns.DOCID, 2);
-        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, "bravo_title");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, "bravo title");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "bravo_summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "bravo summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "bravo_summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "bravo summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "bravo entries");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "bravo keywords");
-        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
-                "com.android.settings.gestures.GestureSettings");
-        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power_1");
-        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, payload);
-        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
-
-        values = new ContentValues();
-        values.put(IndexDatabaseHelper.IndexColumns.DOCID, 3);
-        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, "charlie_title");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, "charlie title");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, "charlie_summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, "charlie summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, "charlie_summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, "charlie summary");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, "charlie entries");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, "charlie keywords");
-        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME,
-                "com.android.settings.gestures.GestureSettings");
-        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, false);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, "gesture_double_tap_power_2");
-        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, payload);
-
-        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
-    }
-
-    private void insertSameValueAllFieldsCase(String key) {
-        final ResultPayload payload = new ResultPayload(new Intent());
-
-        ContentValues values = new ContentValues();
-        values.put(IndexDatabaseHelper.IndexColumns.DOCID, key.hashCode());
-        values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, key);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE_NORMALIZED, key);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON, key);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_ON_NORMALIZED, key);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF, key);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_SUMMARY_OFF_NORMALIZED, key);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_ENTRIES, key);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEYWORDS, key);
-        values.put(IndexDatabaseHelper.IndexColumns.CLASS_NAME, key);
-        values.put(IndexDatabaseHelper.IndexColumns.SCREEN_TITLE, "Moves");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_ACTION, key);
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_PACKAGE, "");
-        values.put(IndexDatabaseHelper.IndexColumns.INTENT_TARGET_CLASS, key);
-        values.put(IndexDatabaseHelper.IndexColumns.ICON, "");
-        values.put(IndexDatabaseHelper.IndexColumns.ENABLED, true);
-        values.put(IndexDatabaseHelper.IndexColumns.DATA_KEY_REF, key.hashCode());
-        values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, ResultPayloadUtils.marshall(payload));
-
-        mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
-    }
-
-    private List<? extends SearchResult> getDummyDbResults() {
-        List<SearchResult> results = new ArrayList<>();
-        ResultPayload payload = new ResultPayload(new Intent());
-        SearchResult.Builder builder = new SearchResult.Builder();
-        builder.setPayload(payload)
-                .setTitle(STATIC_TITLES[0])
-                .setStableId(STABLE_IDS[0]);
-        results.add(builder.build());
-
-        builder.setTitle(STATIC_TITLES[1])
-                .setStableId(STABLE_IDS[1]);
-        results.add(builder.build());
-
-        builder.setTitle(STATIC_TITLES[2])
-                .setStableId(STABLE_IDS[2]);
-        results.add(builder.build());
-
-        return results;
-    }
-
-    private List<Pair<String, Float>> getDummyRankingScores() {
-        List<? extends SearchResult> results = getDummyDbResults();
-        List<Pair<String, Float>> scores = new ArrayList<>();
-        scores.add(new Pair<>(Long.toString(results.get(2).stableId), 0.9f)); // static_three
-        scores.add(new Pair<>(Long.toString(results.get(0).stableId), 0.8f)); // static_one
-        scores.add(new Pair<>(Long.toString(results.get(1).stableId), 0.2f)); // static_two
-        return scores;
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java
index e79e2d0..e1c77cd 100644
--- a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java
+++ b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java
@@ -16,20 +16,16 @@
 
 package com.android.settings.search.actionbar;
 
-import static org.mockito.Matchers.nullable;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
-import android.content.Context;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 
 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.core.lifecycle.ObservablePreferenceFragment;
 
@@ -47,30 +43,15 @@
     @Mock
     private Menu mMenu;
     private TestFragment mHost;
-    private FakeFeatureFactory mFeatureFactory;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mHost = new TestFragment();
-        mFeatureFactory = FakeFeatureFactory.setupForTest();
     }
 
     @Test
-    public void init_searchV2Disabled_shouldNotAddMenu() {
-        when(mFeatureFactory.searchFeatureProvider.isSearchV2Enabled(nullable(Context.class)))
-                .thenReturn(false);
-
-        SearchMenuController.init(mHost);
-        mHost.getLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */);
-
-        verifyZeroInteractions(mMenu);
-    }
-
-    @Test
-    public void init_searchV2Enabled_shouldAddMenu() {
-        when(mFeatureFactory.searchFeatureProvider.isSearchV2Enabled(nullable(Context.class)))
-                .thenReturn(true);
+    public void init_shouldAddMenu() {
         when(mMenu.add(Menu.NONE, Menu.NONE, 0 /* order */, R.string.search_menu))
                 .thenReturn(mock(MenuItem.class));
 
diff --git a/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java
new file mode 100644
index 0000000..4aaf5f4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java
@@ -0,0 +1,85 @@
+/*
+ * 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.security;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.os.UserManager;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowUtils;
+
+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,
+        shadows = {
+                ShadowUtils.class
+        })
+public class ChangeScreenLockPreferenceControllerTest {
+
+    @Mock
+    private LockPatternUtils mLockPatternUtils;
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private DevicePolicyManager mDevicePolicyManager;
+
+    private Context mContext;
+    private FakeFeatureFactory mFeatureFactory;
+    private ChangeScreenLockPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application.getApplicationContext());
+        mFeatureFactory = FakeFeatureFactory.setupForTest();
+        when(mFeatureFactory.securityFeatureProvider.getLockPatternUtils(mContext))
+                .thenReturn(mLockPatternUtils);
+        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE))
+                .thenReturn(mDevicePolicyManager);
+        mController = new ChangeScreenLockPreferenceController(mContext, null  /* Host */ );
+    }
+
+    @Test
+    public void testDeviceAdministrators_byDefault_shouldBeShown() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    @Config(qualifiers = "mcc999")
+    public void testDeviceAdministrators_ifDisabled_shouldNotBeShown() {
+        assertThat(mController.isAvailable()).isFalse();
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java
index 4ee9206..c5177ac 100644
--- a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java
@@ -59,8 +59,14 @@
     }
 
     @Test
-    public void isAlwaysAvailable() {
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    public void isAvailable_byDefault_isTrue() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    @Config(qualifiers = "mcc999")
+    public void isAvailable_whenNotVisible_isFalse() {
+        assertThat(mController.isAvailable()).isFalse();
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java
index 63cf00b..6bcb1d3 100644
--- a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java
@@ -70,8 +70,14 @@
     }
 
     @Test
-    public void isAlwaysAvailable() {
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    public void isAvailable_byDefault_isTrue() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    @Config(qualifiers = "mcc999")
+    public void isAvailable_whenNotVisible_isFalse() {
+        assertThat(mController.isAvailable()).isFalse();
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java
index 8818602..42d640a 100644
--- a/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java
@@ -75,8 +75,14 @@
     }
 
     @Test
-    public void isAlwaysAvailable() {
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    public void isAvailable_byDefault_isTrue() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    @Config(qualifiers = "mcc999")
+    public void isAvailable_whenNotVisible_isFalse() {
+        assertThat(mController.isAvailable()).isFalse();
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java
index 684274c..7dd04c6 100644
--- a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java
@@ -25,6 +25,7 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -38,6 +39,7 @@
 
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.TestConfig;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.security.SecuritySettingsV2;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -99,6 +101,13 @@
     public void testConstants() {
         assertThat(mController.isAvailable()).isTrue();
         assertThat(mController.getPreferenceKey()).isEqualTo(PREF_KEY_TRUST_AGENT);
+        assertThat(mController).isInstanceOf(PreferenceControllerMixin.class);
+    }
+
+    @Test
+    @Config(qualifiers = "mcc999")
+    public void isAvailable_whenNotVisible_isFalse() {
+        assertThat(mController.isAvailable()).isFalse();
     }
 
     @Test
@@ -133,4 +142,24 @@
 
         verify(mCategory, atLeastOnce()).addPreference(any(Preference.class));
     }
+
+    @Test
+    @Config(qualifiers = "mcc999")
+    public void onResume_ifNotAvailable_shouldNotAddNewAgents() {
+        final List<TrustAgentManager.TrustAgentComponentInfo> agents = new ArrayList<>();
+        final TrustAgentManager.TrustAgentComponentInfo agent = mock(
+                TrustAgentManager.TrustAgentComponentInfo.class);
+        agent.title = "Test_title";
+        agent.summary = "test summary";
+        agent.componentName = new ComponentName("pkg", "agent");
+        agent.admin = null;
+        agents.add(agent);
+        when(mTrustAgentManager.getActiveTrustAgents(mActivity, mLockPatternUtils))
+                .thenReturn(agents);
+
+        mController.displayPreference(mScreen);
+        mController.onResume();
+
+        verify(mCategory, never()).addPreference(any(Preference.class));
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
index 2af15e2..340d04b 100644
--- a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
@@ -19,6 +19,8 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 
 import android.content.ContentValues;
@@ -38,15 +40,22 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+import java.util.HashMap;
+
 import androidx.app.slice.Slice;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SettingsSliceProviderTest {
 
-    private final String fakeTitle = "title";
-    private final String KEY = "key";
-
+    private final String KEY = "KEY";
+    private final String TITLE = "title";
+    private final String SUMMARY = "summary";
+    private final String SCREEN_TITLE = "screen title";
+    private final String FRAGMENT_NAME = "fragment name";
+    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 = FakeToggleController.class.getName();
     private Context mContext;
     private SettingsSliceProvider mProvider;
     private SQLiteDatabase mDb;
@@ -55,6 +64,7 @@
     public void setUp() {
         mContext = spy(RuntimeEnvironment.application);
         mProvider = spy(new SettingsSliceProvider());
+        mProvider.mSliceDataCache = new HashMap<>();
         mDb = SlicesDatabaseHelper.getInstance(mContext).getWritableDatabase();
         SlicesDatabaseHelper.getInstance(mContext).setIndexedState();
     }
@@ -82,10 +92,39 @@
         assertThat(uri.getLastPathSegment()).isEqualTo(KEY);
     }
 
+    @Test
+    public void testLoadSlice_returnsSliceFromAccessor() {
+        ContentResolver mockResolver = mock(ContentResolver.class);
+        doReturn(mockResolver).when(mContext).getContentResolver();
+        doReturn(mContext).when(mProvider).getContext();
+        mProvider.mSlicesDatabaseAccessor = new SlicesDatabaseAccessor(mContext);
+        insertSpecialCase(KEY);
+        Uri uri = SettingsSliceProvider.getUri(KEY);
+
+        mProvider.loadSlice(uri);
+        SliceData data = mProvider.mSliceDataCache.get(uri);
+
+        assertThat(data.getKey()).isEqualTo(KEY);
+        assertThat(data.getTitle()).isEqualTo(TITLE);
+    }
+
+    @Test
+    public void testLoadSlice_cachedEntryRemovedOnBuild() {
+        doReturn(mContext).when(mProvider).getContext();
+        SliceData data = getDummyData();
+        mProvider.mSliceDataCache.put(data.getUri(), data);
+        mProvider.onBindSlice(data.getUri());
+        insertSpecialCase(data.getKey());
+
+        SliceData cachedData = mProvider.mSliceDataCache.get(data.getUri());
+
+        assertThat(cachedData).isNull();
+    }
+
     private void insertSpecialCase(String key) {
         ContentValues values = new ContentValues();
         values.put(SlicesDatabaseHelper.IndexColumns.KEY, key);
-        values.put(SlicesDatabaseHelper.IndexColumns.TITLE, fakeTitle);
+        values.put(SlicesDatabaseHelper.IndexColumns.TITLE, TITLE);
         values.put(SlicesDatabaseHelper.IndexColumns.SUMMARY, "s");
         values.put(SlicesDatabaseHelper.IndexColumns.SCREENTITLE, "s");
         values.put(SlicesDatabaseHelper.IndexColumns.ICON_RESOURCE, 1234);
@@ -94,4 +133,17 @@
 
         mDb.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values);
     }
+
+    private SliceData getDummyData() {
+        return new SliceData.Builder()
+                .setKey(KEY)
+                .setTitle(TITLE)
+                .setSummary(SUMMARY)
+                .setScreenTitle(SCREEN_TITLE)
+                .setIcon(ICON)
+                .setFragmentName(FRAGMENT_NAME)
+                .setUri(URI)
+                .setPreferenceControllerClassName(PREF_CONTROLLER)
+                .build();
+    }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/widget/LinearColorBarTest.java b/tests/robotests/src/com/android/settings/widget/LinearColorBarTest.java
new file mode 100644
index 0000000..dc14ae7
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/widget/LinearColorBarTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.widget;
+
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.graphics.Canvas;
+
+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.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowCanvas;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class LinearColorBarTest {
+
+    private static final int HEIGHT = 100;
+    private static final int WIDTH = 100;
+
+    private Context mContext;
+    private LinearColorBar mLinearColorBar;
+    private Canvas mCanvas;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mLinearColorBar = spy(new LinearColorBar(mContext, null /* attrs */));
+        when(mLinearColorBar.getHeight()).thenReturn(HEIGHT);
+        when(mLinearColorBar.getWidth()).thenReturn(WIDTH);
+        mLinearColorBar.setRatios(0.2f, 0.4f, 0.4f);
+        mLinearColorBar.setColors(1, 2, 3);
+        mCanvas = new Canvas();
+    }
+
+    @Test
+    public void draw_ltr_showStartFromLeft() {
+        mLinearColorBar.onDraw(mCanvas);
+
+        final ShadowCanvas shadowCanvas = Shadows.shadowOf(mCanvas);
+        assertThat(shadowCanvas.getRectPaintHistoryCount()).isEqualTo(3);
+
+        // 3 boxes, takes space of 20%, 40%, 40% of the the WIDTH correspondingly.
+        assertThat(shadowCanvas.getDrawnRect(0).left).isWithin(0.01f).of(0);
+        assertThat(shadowCanvas.getDrawnRect(1).left).isWithin(0.01f).of(20);
+        assertThat(shadowCanvas.getDrawnRect(2).left).isWithin(0.01f).of(60);
+    }
+
+    @Test
+    public void draw_rtl_showStartFromRight() {
+        when(mLinearColorBar.isLayoutRtl()).thenReturn(true);
+
+        mLinearColorBar.onDraw(mCanvas);
+
+        final ShadowCanvas shadowCanvas = Shadows.shadowOf(mCanvas);
+        assertThat(shadowCanvas.getRectPaintHistoryCount()).isEqualTo(3);
+
+        // 3 boxes, takes space of 20%, 40%, 40% of the the WIDTH correspondingly.
+        assertThat(shadowCanvas.getDrawnRect(0).right).isWithin(0.01f).of(100);
+        assertThat(shadowCanvas.getDrawnRect(1).right).isWithin(0.01f).of(80);
+        assertThat(shadowCanvas.getDrawnRect(2).right).isWithin(0.01f).of(40);
+    }
+}
diff --git a/tests/uitests/Android.mk b/tests/uitests/Android.mk
new file mode 100644
index 0000000..870f59c
--- /dev/null
+++ b/tests/uitests/Android.mk
@@ -0,0 +1,35 @@
+# Copyright (C) 2018 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := SettingsUITests
+LOCAL_COMPATIBILITY_SUITE := device-tests
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_MODULE_TAGS := tests
+LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    app-helpers-core \
+    launcher-helper-lib \
+    settings-helper \
+    timeresult-helper-lib \
+    ub-uiautomator \
+    sysui-helper \
+    metrics-helper-lib \
+    platform-test-annotations \
+
+#LOCAL_SDK_VERSION := current
+
+include $(BUILD_PACKAGE)
diff --git a/tests/uitests/AndroidManifest.xml b/tests/uitests/AndroidManifest.xml
new file mode 100644
index 0000000..06d74c6
--- /dev/null
+++ b/tests/uitests/AndroidManifest.xml
@@ -0,0 +1,34 @@
+<?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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.ui">
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.READ_LOGS" />
+
+    <instrumentation
+            android:name="android.support.test.runner.AndroidJUnitRunner"
+            android:targetPackage="com.android.settings.ui"
+            android:label="Android Settings Functional UI Tests" />
+</manifest>
diff --git a/tests/uitests/AndroidTest.xml b/tests/uitests/AndroidTest.xml
new file mode 100644
index 0000000..fbeea2d
--- /dev/null
+++ b/tests/uitests/AndroidTest.xml
@@ -0,0 +1,27 @@
+<?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.
+-->
+<configuration description="Run Android Settings Functional UI Tests.">
+    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+        <option name="test-file-name" value="SettingsUITests.apk" />
+    </target_preparer>
+
+    <option name="test-suite-tag" value="apct" />
+    <option name="test-tag" value="SettingsUITests" />
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="com.android.settings.ui" />
+        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+    </test>
+</configuration>
diff --git a/tests/uitests/src/com/android/settings/ui/AboutPhoneSettingsTests.java b/tests/uitests/src/com/android/settings/ui/AboutPhoneSettingsTests.java
new file mode 100644
index 0000000..57f9bc2
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/AboutPhoneSettingsTests.java
@@ -0,0 +1,224 @@
+/*
+ * 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.ui;
+
+import android.content.Intent;
+import android.os.RemoteException;
+import android.provider.Settings;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.Direction;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.test.suitebuilder.annotation.Suppress;
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+
+/** Verifies basic functionality of the About Phone screen */
+public class AboutPhoneSettingsTests extends InstrumentationTestCase {
+    private static final boolean LOCAL_LOGV = false;
+    private static final String TAG = "AboutPhoneSettingsTest";
+    private static final int TIMEOUT = 2000;
+    private static final String SETTINGS_PACKAGE = "com.android.settings";
+
+    private UiDevice mDevice;
+
+    // TODO: retrieve using name/ids from com.android.settings package
+    private static final String[] sResourceTexts = {
+        "Status",
+        "Legal information",
+        "Regulatory labels",
+        "Model",
+        "Android version",
+        "Android security patch level",
+        "Baseband version",
+        "Kernel version",
+        "Build number"
+    };
+
+    private static final String[] sClickableResourceTexts = {
+        "Status", "Legal information", "Regulatory labels",
+    };
+
+    @Override
+    public void setUp() throws Exception {
+        if (LOCAL_LOGV) {
+            Log.d(TAG, "-------");
+        }
+        super.setUp();
+        mDevice = UiDevice.getInstance(getInstrumentation());
+        try {
+            mDevice.setOrientationNatural();
+        } catch (RemoteException e) {
+            throw new RuntimeException("Failed to freeze device orientaion", e);
+        }
+
+        // make sure we are in a clean state before starting the test
+        mDevice.pressHome();
+        Thread.sleep(TIMEOUT * 2);
+        launchAboutPhoneSettings(Settings.ACTION_DEVICE_INFO_SETTINGS);
+        // TODO: make sure we are always at the top of the app
+        // currently this will fail if the user has navigated into submenus
+        UiObject2 view =
+                mDevice.wait(
+                        Until.findObject(By.res(SETTINGS_PACKAGE + ":id/main_content")), TIMEOUT);
+        assertNotNull("Could not find main About Phone screen", view);
+        view.scroll(Direction.UP, 1.0f);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        // Adding an extra pressBack so we exit About Phone Settings
+        // and finish the test cleanly
+        mDevice.pressBack();
+        mDevice.pressHome(); // finish settings activity
+        mDevice.waitForIdle(TIMEOUT * 2); // give UI time to finish animating
+        super.tearDown();
+    }
+
+    private void launchAboutPhoneSettings(String aboutSetting) throws Exception {
+        Intent aboutIntent = new Intent(aboutSetting);
+        aboutIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        getInstrumentation().getContext().startActivity(aboutIntent);
+    }
+
+    /**
+     * Callable actions that can be taken when a UIObject2 is found
+     *
+     * @param device The current UiDevice
+     * @param item The UiObject2 that was found and can be acted on
+     *
+     * @return {@code true} if the call was successful, and {@code false} otherwise
+     */
+    public interface UIObject2Callback {
+        boolean call(UiDevice device, UiObject2 item) throws Exception;
+    }
+
+    /**
+     * Clicks the given item and then presses the Back button
+     *
+     * <p>Used to test whether a given UiObject2 can be successfully clicked.
+     * Presses Back to restore state to the previous screen.
+     *
+     * @param device The device that can be used to press Back
+     * @param item The item to click
+     *
+     * @return {@code true} if clicking the item succeeded, and {@code false} otherwise
+     */
+    public class UiObject2Clicker implements UIObject2Callback {
+        public boolean call(UiDevice device, UiObject2 item) throws Exception {
+            item.click();
+            Thread.sleep(TIMEOUT * 2); // give UI time to finish animating
+            boolean pressWorked = device.pressBack();
+            Thread.sleep(TIMEOUT * 2);
+            return pressWorked;
+        }
+    }
+
+    /**
+     * Removes items found in the view and optionally takes some action.
+     *
+     * @param device The current UiDevice
+     * @param itemsLeftToFind The items to search for in the current view
+     * @param action Action to call on each item that is found; pass {@code null} to take no action
+     */
+    private void removeItemsAndTakeAction(
+            UiDevice device, ArrayList<String> itemsLeftToFind, UIObject2Callback action) throws Exception {
+        for (Iterator<String> iterator = itemsLeftToFind.iterator(); iterator.hasNext(); ) {
+            String itemText = iterator.next();
+            UiObject2 item = device.wait(Until.findObject(By.text(itemText)), TIMEOUT);
+            if (item != null) {
+                if (LOCAL_LOGV) {
+                    Log.d(TAG, itemText + " is present");
+                }
+                iterator.remove();
+                if (action != null) {
+                    boolean success = action.call(device, item);
+                    assertTrue("Calling action after " + itemText + " did not work", success);
+                }
+            } else {
+                if (LOCAL_LOGV) {
+                    Log.d(TAG, "Could not find " + itemText);
+                }
+            }
+        }
+    }
+
+    /**
+     * Searches for UI elements in the current view and optionally takes some action.
+     *
+     * <p>Will scroll down the screen until it has found all elements or reached the bottom.
+     * This allows elements to be found and acted on even if they change order.
+     *
+     * @param device The current UiDevice
+     * @param itemsToFind The items to search for in the current view
+     * @param action Action to call on each item that is found; pass {@code null} to take no action
+     */
+    public void searchForItemsAndTakeAction(UiDevice device, String[] itemsToFind, UIObject2Callback action)
+            throws Exception {
+
+        ArrayList<String> itemsLeftToFind = new ArrayList<String>(Arrays.asList(itemsToFind));
+        assertFalse(
+                "There must be at least one item to search for on the screen!",
+                itemsLeftToFind.isEmpty());
+
+        if (LOCAL_LOGV) {
+            Log.d(TAG, "items: " + TextUtils.join(", ", itemsLeftToFind));
+        }
+        boolean canScrollDown = true;
+        while (canScrollDown && !itemsLeftToFind.isEmpty()) {
+            removeItemsAndTakeAction(device, itemsLeftToFind, action);
+
+            // when we've finished searching the current view, scroll down
+            UiObject2 view =
+                    device.wait(
+                            Until.findObject(By.res(SETTINGS_PACKAGE + ":id/main_content")),
+                            TIMEOUT * 2);
+            if (view != null) {
+                canScrollDown = view.scroll(Direction.DOWN, 1.0f);
+            } else {
+                canScrollDown = false;
+            }
+        }
+        // check the last items once we have reached the bottom of the view
+        removeItemsAndTakeAction(device, itemsLeftToFind, action);
+
+        assertTrue(
+                "The following items were not found on the screen: "
+                        + TextUtils.join(", ", itemsLeftToFind),
+                itemsLeftToFind.isEmpty());
+    }
+
+    @MediumTest // UI interaction
+    public void testAllMenuEntriesExist() throws Exception {
+        searchForItemsAndTakeAction(mDevice, sResourceTexts, null);
+    }
+
+    // Suppressing this test as it might be causing other test failures
+    // Will verify that this test is the cause before proceeding with solution
+    @Suppress
+    @MediumTest // UI interaction
+    public void testClickableEntriesCanBeClicked() throws Exception {
+        searchForItemsAndTakeAction(mDevice, sClickableResourceTexts, new UiObject2Clicker());
+    }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/AccessibilitySettingsTests.java b/tests/uitests/src/com/android/settings/ui/AccessibilitySettingsTests.java
new file mode 100644
index 0000000..83afa65
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/AccessibilitySettingsTests.java
@@ -0,0 +1,279 @@
+/*
+ * 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.ui;
+
+import android.content.Context;
+import android.net.wifi.WifiManager;
+import android.os.RemoteException;
+import android.platform.test.annotations.Presubmit;
+import android.provider.Settings;
+import android.support.test.metricshelper.MetricsAsserts;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.Direction;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+import android.system.helpers.SettingsHelper;
+import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.test.suitebuilder.annotation.Suppress;
+
+import android.metrics.MetricsReader;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+
+public class AccessibilitySettingsTests extends InstrumentationTestCase {
+
+    private static final String SETTINGS_PACKAGE = "com.android.settings";
+    private static final int TIMEOUT = 2000;
+    private UiDevice mDevice;
+    private MetricsReader mMetricsReader;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        mDevice = UiDevice.getInstance(getInstrumentation());
+        try {
+            mDevice.setOrientationNatural();
+        } catch (RemoteException e) {
+            throw new RuntimeException("failed to freeze device orientaion", e);
+        }
+        mMetricsReader = new MetricsReader();
+        // Clear out old logs
+        mMetricsReader.checkpoint();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        // Need to finish settings activity
+        mDevice.pressBack();
+        mDevice.pressHome();
+        mDevice.waitForIdle();
+        super.tearDown();
+    }
+
+    @Presubmit
+    @MediumTest
+    public void testHighContrastTextOn() throws Exception {
+        verifyAccessibilitySettingOnOrOff("High contrast text",
+                Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, 0, 1);
+    }
+
+    @Presubmit
+    @MediumTest
+    public void testHighContrastTextOff() throws Exception {
+        verifyAccessibilitySettingOnOrOff("High contrast text",
+               Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, 1, 0);
+    }
+
+    @Presubmit
+    @MediumTest
+    public void testPowerButtonEndsCallOn() throws Exception {
+        verifyAccessibilitySettingOnOrOff("Power button ends call",
+                Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR, 1, 2);
+    }
+
+    @Presubmit
+    @MediumTest
+    public void testPowerButtonEndsCallOff() throws Exception {
+        verifyAccessibilitySettingOnOrOff("Power button ends call",
+                Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR, 2, 1);
+    }
+
+    /* Suppressing these four tests. The settings don't play
+     * nice with Settings.System.putInt or Settings.Secure.putInt.
+     * Need further clarification. Filed bug b/27792029
+     */
+    @Suppress
+    @MediumTest
+    public void testAutoRotateScreenOn() throws Exception {
+        verifyAccessibilitySettingOnOrOff("Auto-rotate screen",
+               Settings.System.ACCELEROMETER_ROTATION, 0, 1);
+    }
+
+    @Suppress
+    @MediumTest
+    public void testAutoRotateScreenOff() throws Exception {
+       verifyAccessibilitySettingOnOrOff("Auto-rotate screen",
+               Settings.System.ACCELEROMETER_ROTATION, 1, 0);
+    }
+
+    @Suppress
+    @MediumTest
+    public void testMonoAudioOn() throws Exception {
+        verifyAccessibilitySettingOnOrOff("Mono audio",
+               Settings.System.MASTER_MONO, 0, 1);
+    }
+
+    @Suppress
+    @MediumTest
+    public void testMonoAudioOff() throws Exception {
+         verifyAccessibilitySettingOnOrOff("Mono audio",
+                Settings.System.MASTER_MONO, 1, 0);
+    }
+
+    @Presubmit
+    @MediumTest
+    public void testLargeMousePointerOn() throws Exception {
+         verifyAccessibilitySettingOnOrOff("Large mouse pointer",
+                 Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, 0, 1);
+    }
+
+    @Presubmit
+    @MediumTest
+    public void testLargeMousePointerOff() throws Exception {
+         verifyAccessibilitySettingOnOrOff("Large mouse pointer",
+                 Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, 1, 0);
+    }
+
+    @Presubmit
+    @MediumTest
+    public void testColorCorrection() throws Exception {
+        verifySettingToggleAfterScreenLoad("Color correction",
+                Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED);
+        MetricsAsserts.assertHasVisibilityLog("Missing color correction log",
+                mMetricsReader, MetricsEvent.ACCESSIBILITY_TOGGLE_DALTONIZER, true);
+    }
+
+    // Suppressing this test, since UiAutomator + talkback don't play nice
+    @Suppress
+    @MediumTest
+    public void testTalkback() throws Exception {
+        verifySettingToggleAfterScreenLoad("TalkBack",
+                Settings.Secure.ACCESSIBILITY_ENABLED);
+    }
+
+    @Presubmit
+    @MediumTest
+    public void testCaptions() throws Exception {
+         verifySettingToggleAfterScreenLoad("Captions",
+                 Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED);
+        MetricsAsserts.assertHasVisibilityLog("Missing captions log",
+                mMetricsReader, MetricsEvent.ACCESSIBILITY_CAPTION_PROPERTIES, true);
+    }
+
+    @Presubmit
+    @MediumTest
+    public void testMagnificationGesture() throws Exception {
+        verifySettingToggleAfterScreenLoad("Magnification", "Magnify with triple-tap",
+                 Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED);
+        MetricsAsserts.assertHasVisibilityLog("Missing magnification log",
+                mMetricsReader, MetricsEvent.ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION, true);
+    }
+
+    @MediumTest
+    public void testClickAfterPointerStopsMoving() throws Exception {
+         verifySettingToggleAfterScreenLoad("Click after pointer stops moving",
+                  Settings.Secure.ACCESSIBILITY_AUTOCLICK_ENABLED);
+    }
+
+    @MediumTest
+    public void testAccessibilitySettingsLoadLog() throws Exception {
+        launchAccessibilitySettings();
+        MetricsAsserts.assertHasVisibilityLog("Missing accessibility settings load log",
+                mMetricsReader, MetricsEvent.ACCESSIBILITY, true);
+    }
+
+    public void launchAccessibilitySettings() throws Exception {
+        SettingsHelper.launchSettingsPage(getInstrumentation().getContext(),
+                Settings.ACTION_ACCESSIBILITY_SETTINGS);
+    }
+
+    private void verifyAccessibilitySettingOnOrOff(String settingText,
+            String settingFlag, int initialFlagValue, int expectedFlagValue)
+            throws Exception {
+        Settings.Secure.putInt(getInstrumentation().getContext().getContentResolver(),
+                settingFlag, initialFlagValue);
+        launchAccessibilitySettings();
+        UiObject2 settingsTitle = findItemOnScreen(settingText);
+        settingsTitle.click();
+        Thread.sleep(TIMEOUT);
+        int settingValue = Settings.Secure
+                .getInt(getInstrumentation().getContext().getContentResolver(), settingFlag);
+        assertEquals(settingText + " not correctly set after toggle",
+                expectedFlagValue, settingValue);
+    }
+
+    private void verifySettingToggleAfterScreenLoad(String settingText, String settingFlag)
+            throws Exception {
+        verifySettingToggleAfterScreenLoad(settingText, null, settingFlag);
+    }
+
+    private void verifySettingToggleAfterScreenLoad
+            (String settingText, String subSetting, String settingFlag) throws Exception {
+        // Load accessibility settings
+        launchAccessibilitySettings();
+        Settings.Secure.putInt(getInstrumentation().getContext().getContentResolver(),
+                settingFlag, 0);
+        Thread.sleep(TIMEOUT);
+        // Tap on setting required
+        UiObject2 settingTitle = findItemOnScreen(settingText);
+        // Load screen
+        settingTitle.click();
+        Thread.sleep(TIMEOUT);
+        if (subSetting != null) {
+            UiObject2 subSettingObject = findItemOnScreen(subSetting);
+            subSettingObject.click();
+            Thread.sleep(TIMEOUT);
+        }
+        // Toggle value
+        UiObject2 settingToggle =  mDevice.wait(Until.findObject(By.text("Off")),
+                            TIMEOUT);
+        settingToggle.click();
+        dismissOpenDialog();
+        Thread.sleep(TIMEOUT);
+        // Assert new value
+        int settingValue = Settings.Secure.
+                getInt(getInstrumentation().getContext().getContentResolver(), settingFlag);
+        assertEquals(settingText + " value not set correctly", 1, settingValue);
+        // Toogle value
+        settingToggle.click();
+        dismissOpenDialog();
+        mDevice.pressBack();
+        Thread.sleep(TIMEOUT);
+        // Assert reset to old value
+        settingValue = Settings.Secure.
+                getInt(getInstrumentation().getContext().getContentResolver(), settingFlag);
+        assertEquals(settingText + " value not set correctly", 0, settingValue);
+    }
+
+    private UiObject2 findItemOnScreen(String item) throws Exception {
+        int count = 0;
+        UiObject2 settingsPanel = mDevice.wait(Until.findObject
+                (By.res(SETTINGS_PACKAGE, "list")), TIMEOUT);
+        while (settingsPanel.fling(Direction.UP) && count < 3) {
+            count++;
+        }
+        count = 0;
+        UiObject2 setting = null;
+        while(count < 3 && setting == null) {
+            setting = mDevice.wait(Until.findObject(By.text(item)), TIMEOUT);
+            if (setting == null) {
+                settingsPanel.scroll(Direction.DOWN, 1.0f);
+            }
+            count++;
+        }
+        return setting;
+    }
+
+    private void dismissOpenDialog() throws Exception {
+        UiObject2 okButton = mDevice.wait(Until.findObject
+                (By.res("android:id/button1")), TIMEOUT*2);
+        if (okButton != null) {
+            okButton.click();
+        }
+    }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/AppsSettingsTests.java b/tests/uitests/src/com/android/settings/ui/AppsSettingsTests.java
new file mode 100644
index 0000000..6be49d6
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/AppsSettingsTests.java
@@ -0,0 +1,136 @@
+/*
+ * 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.ui;
+
+import android.content.Intent;
+import android.os.RemoteException;
+import android.provider.Settings;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.Direction;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+import android.system.helpers.ActivityHelper;
+import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+
+/** Verifies basic functionality of the About Phone screen */
+public class AppsSettingsTests extends InstrumentationTestCase {
+    private static final boolean LOCAL_LOGV = false;
+    private static final String SETTINGS_PACKAGE = "com.android.settings";
+    private static final String TAG = "AboutPhoneSettingsTest";
+    private static final int TIMEOUT = 2000;
+    private ActivityHelper mActivityHelper = null;
+
+    private UiDevice mDevice;
+
+    private static final String[] sResourceTexts = {
+        "Storage",
+        "Data usage",
+        "Permissions",
+        "App notifications",
+        "Open by default",
+        "Battery",
+        "Memory"
+    };
+
+    @Override
+    public void setUp() throws Exception {
+        if (LOCAL_LOGV) {
+            Log.d(TAG, "-------");
+        }
+        super.setUp();
+        mDevice = UiDevice.getInstance(getInstrumentation());
+        mActivityHelper = ActivityHelper.getInstance();
+        try {
+            mDevice.setOrientationNatural();
+        } catch (RemoteException e) {
+            throw new RuntimeException("Failed to freeze device orientaion", e);
+        }
+
+        // make sure we are in a clean state before starting the test
+        mDevice.pressHome();
+        Thread.sleep(TIMEOUT * 2);
+        launchAppsSettings();
+        UiObject2 view =
+                mDevice.wait(
+                        Until.findObject(By.text("All apps")), TIMEOUT);
+        assertNotNull("Could not find Settings > Apps screen", view);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        mDevice.pressBack();
+        mDevice.pressHome(); // finish settings activity
+        mDevice.waitForIdle(TIMEOUT * 2); // give UI time to finish animating
+        super.tearDown();
+    }
+
+    @MediumTest
+    public void testAppSettingsListForCalculator() {
+        UiObject2 calculator = mDevice.wait(
+                Until.findObject(By.text("Calculator")), TIMEOUT);
+        calculator.click();
+        for (String setting : sResourceTexts) {
+            UiObject2 appSetting =
+                mDevice.wait(
+                        Until.findObject(By.text(setting)), TIMEOUT);
+            assertNotNull("Missing setting for Calculator: " + setting, appSetting);
+            appSetting.scroll(Direction.DOWN, 10.0f);
+        }
+    }
+
+    @MediumTest
+    public void testDisablingAndEnablingSystemApp() throws Exception {
+        launchAppsSettings();
+        UiObject2 calculator = mDevice.wait(
+                Until.findObject(By.text("Calculator")), TIMEOUT);
+        calculator.click();
+        mDevice.waitForIdle(TIMEOUT);
+        UiObject2 appInfoList = mDevice.wait(
+            Until.findObject(By.res(SETTINGS_PACKAGE, "list")), TIMEOUT);
+        appInfoList.scroll(Direction.DOWN, 100.0f);
+        UiObject2 disableButton = mDevice.wait(
+                Until.findObject(By.text("DISABLE")), TIMEOUT);
+        disableButton.click();
+        mDevice.waitForIdle(TIMEOUT);
+        // Click on "Disable App" on dialog.
+        mDevice.wait(
+                Until.findObject(By.text("DISABLE APP")), TIMEOUT).click();
+        mDevice.waitForIdle(TIMEOUT);
+        UiObject2 enableButton = mDevice.wait(
+                Until.findObject(By.text("ENABLE")), TIMEOUT);
+        assertNotNull("App not disabled successfully", enableButton);
+        enableButton.click();
+        mDevice.waitForIdle(TIMEOUT);
+        disableButton = mDevice.wait(
+                Until.findObject(By.text("DISABLE")), TIMEOUT);
+        assertNotNull("App not enabled successfully", disableButton);
+    }
+
+    private void launchAppsSettings() throws Exception {
+        Intent appsSettingsIntent = new
+                Intent(Settings.ACTION_MANAGE_APPLICATIONS_SETTINGS);
+        mActivityHelper.launchIntent(appsSettingsIntent);
+    }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/BluetoothNetworkSettingsTests.java b/tests/uitests/src/com/android/settings/ui/BluetoothNetworkSettingsTests.java
new file mode 100644
index 0000000..d41be9c
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/BluetoothNetworkSettingsTests.java
@@ -0,0 +1,163 @@
+/*
+ * 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.ui;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothManager;
+import android.content.Context;
+import android.content.Intent;
+import android.metrics.MetricsReader;
+import android.os.RemoteException;
+import android.platform.test.annotations.Presubmit;
+import android.provider.Settings;
+import android.support.test.metricshelper.MetricsAsserts;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.BySelector;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+
+public class BluetoothNetworkSettingsTests extends InstrumentationTestCase {
+
+    private static final String SETTINGS_PACKAGE = "com.android.settings";
+    private static final int TIMEOUT = 2000;
+    private static final int LONG_TIMEOUT = 40000;
+    private UiDevice mDevice;
+    private MetricsReader mMetricsReader;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        mDevice = UiDevice.getInstance(getInstrumentation());
+        try {
+            mDevice.setOrientationNatural();
+        } catch (RemoteException e) {
+            throw new RuntimeException("failed to freeze device orientaion", e);
+        }
+        mMetricsReader = new MetricsReader();
+        // Clear out old logs
+        mMetricsReader.checkpoint();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        mDevice.pressBack();
+        mDevice.pressHome();
+        mDevice.waitForIdle();
+        super.tearDown();
+    }
+
+    @Presubmit
+    @MediumTest
+    public void testBluetoothEnabled() throws Exception {
+        verifyBluetoothOnOrOff(true);
+        MetricsAsserts.assertHasActionLog("missing bluetooth toggle log",
+                mMetricsReader, MetricsEvent.ACTION_BLUETOOTH_TOGGLE);
+    }
+
+    @Presubmit
+    @MediumTest
+    public void testBluetoothDisabled() throws Exception {
+        verifyBluetoothOnOrOff(false);
+        MetricsAsserts.assertHasActionLog("missing bluetooth toggle log",
+                mMetricsReader, MetricsEvent.ACTION_BLUETOOTH_TOGGLE);
+    }
+
+    @MediumTest
+    public void testRenameOption() throws Exception {
+        launchBluetoothSettings();
+        verifyUiObjectClicked(By.text("Device name"), "Rename preference");
+        verifyUiObjectClicked(By.text("CANCEL"), "CANCEL button");
+
+        MetricsAsserts.assertHasActionLog("missing bluetooth rename device log",
+                mMetricsReader, MetricsEvent.ACTION_BLUETOOTH_RENAME);
+        MetricsAsserts.assertHasVisibilityLog("missing bluetooth rename dialog log",
+                mMetricsReader, MetricsEvent.DIALOG_BLUETOOTH_RENAME, true);
+    }
+
+    @MediumTest
+    public void testReceivedFilesOption() throws Exception {
+        launchBluetoothSettings();
+        verifyUiObjectClicked(By.text("Received files"), "Received files preference");
+
+        MetricsAsserts.assertHasActionLog("missing bluetooth received files log",
+                mMetricsReader, MetricsEvent.ACTION_BLUETOOTH_FILES);
+    }
+
+    @MediumTest
+    public void testHelpFeedbackOverflowOption() throws Exception {
+        launchBluetoothSettings();
+
+        // Verify help & feedback
+        assertNotNull("Help & feedback item not found under Bluetooth Settings",
+                mDevice.wait(Until.findObject(By.desc("Help & feedback")), TIMEOUT));
+    }
+
+    public void launchBluetoothSettings() throws Exception {
+        Intent btIntent = new Intent(Settings.ACTION_BLUETOOTH_SETTINGS);
+        btIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        getInstrumentation().getContext().startActivity(btIntent);
+        Thread.sleep(TIMEOUT * 2);
+    }
+
+    /**
+     * Find the {@link UiObject2} by {@code itemSelector} and try to click it if possible.
+     *
+     * If not find, throw assertion error
+     * @param itemSelector used to find the {@link UiObject2}
+     * @param text the description of the {@link UiObject2}
+     */
+    private void verifyUiObjectClicked(BySelector itemSelector, String text) throws Exception {
+        UiObject2 uiObject2 = mDevice.wait(Until.findObject(itemSelector), TIMEOUT);
+        assertNotNull(text + "is not present in bluetooth settings page", uiObject2);
+        uiObject2.click();
+    }
+
+    /**
+     * Toggles the Bluetooth switch and verifies that the change is reflected in Settings
+     *
+     * @param verifyOn set to whether you want the setting turned On or Off
+     */
+    private void verifyBluetoothOnOrOff(boolean verifyOn) throws Exception {
+        String switchText = "ON";
+        BluetoothAdapter bluetoothAdapter = ((BluetoothManager) getInstrumentation().getContext()
+                .getSystemService(Context.BLUETOOTH_SERVICE)).getAdapter();
+        if (verifyOn) {
+            switchText = "OFF";
+            bluetoothAdapter.disable();
+        } else {
+            bluetoothAdapter.enable();
+        }
+        launchBluetoothSettings();
+        mDevice.wait(Until
+                .findObject(By.res(SETTINGS_PACKAGE, "switch_widget").text(switchText)), TIMEOUT)
+                .click();
+        Thread.sleep(TIMEOUT);
+        String bluetoothValue =
+                Settings.Global.getString(getInstrumentation().getContext().getContentResolver(),
+                        Settings.Global.BLUETOOTH_ON);
+        if (verifyOn) {
+            assertEquals("1", bluetoothValue);
+        } else {
+            assertEquals("0", bluetoothValue);
+        }
+    }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/ConnectedDeviceTests.java b/tests/uitests/src/com/android/settings/ui/ConnectedDeviceTests.java
new file mode 100644
index 0000000..971d724
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/ConnectedDeviceTests.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.ui;
+
+import android.content.Context;
+import android.content.Intent;
+import android.nfc.NfcAdapter;
+import android.nfc.NfcManager;
+import android.os.RemoteException;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ConnectedDeviceTests {
+
+    private static final String SETTINGS_PACKAGE = "com.android.settings";
+    private static final int TIMEOUT = 2000;
+    private UiDevice mDevice;
+
+    @Before
+    public void setUp() throws Exception {
+        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+        try {
+            mDevice.setOrientationNatural();
+        } catch (RemoteException e) {
+            throw new RuntimeException("failed to freeze device orientation", e);
+        }
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        mDevice.pressBack();
+        mDevice.pressHome();
+    }
+
+    // This NFC toggle test is set up this way since there's no way to set
+    // the NFC flag to enabled or disabled without touching UI.
+    // This way, we get coverage for whether or not the toggle button works.
+    @Test
+    public void testNFCToggle() throws Exception {
+        NfcManager manager = (NfcManager) InstrumentationRegistry.getTargetContext()
+                .getSystemService(Context.NFC_SERVICE);
+        NfcAdapter nfcAdapter = manager.getDefaultAdapter();
+        boolean nfcInitiallyEnabled = nfcAdapter.isEnabled();
+        InstrumentationRegistry.getContext().startActivity(new Intent()
+                .setClassName(
+                        SETTINGS_PACKAGE,
+                        "com.android.settings.Settings$ConnectedDeviceDashboardActivity"));
+        UiObject2 nfcSetting = mDevice.wait(Until.findObject(By.text("NFC")), TIMEOUT);
+        nfcSetting.click();
+        Thread.sleep(TIMEOUT * 2);
+        if (nfcInitiallyEnabled) {
+            assertFalse("NFC wasn't disabled on toggle", nfcAdapter.isEnabled());
+            nfcSetting.click();
+            Thread.sleep(TIMEOUT * 2);
+            assertTrue("NFC wasn't enabled on toggle", nfcAdapter.isEnabled());
+        } else {
+            assertTrue("NFC wasn't enabled on toggle", nfcAdapter.isEnabled());
+            nfcSetting.click();
+            Thread.sleep(TIMEOUT * 2);
+            assertFalse("NFC wasn't disabled on toggle", nfcAdapter.isEnabled());
+        }
+    }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/DataUsageSettingsTests.java b/tests/uitests/src/com/android/settings/ui/DataUsageSettingsTests.java
new file mode 100644
index 0000000..725ba5c
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/DataUsageSettingsTests.java
@@ -0,0 +1,84 @@
+/*
+ * 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.ui;
+
+import android.os.RemoteException;
+import android.provider.Settings;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.Until;
+import android.system.helpers.SettingsHelper;
+import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.test.suitebuilder.annotation.Suppress;
+
+public class DataUsageSettingsTests extends InstrumentationTestCase {
+
+    private static final String SETTINGS_PACKAGE = "com.android.settings";
+    private static final int TIMEOUT = 2000;
+    private UiDevice mDevice;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        mDevice = UiDevice.getInstance(getInstrumentation());
+        try {
+            mDevice.setOrientationNatural();
+        } catch (RemoteException e) {
+            throw new RuntimeException("failed to freeze device orientaion", e);
+        }
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        // Need to finish settings activity
+        mDevice.pressBack();
+        mDevice.pressHome();
+        super.tearDown();
+    }
+
+    @MediumTest
+    public void testElementsOnDataUsageScreen() throws Exception {
+        launchDataUsageSettings();
+        assertNotNull("Data usage element not found",
+                mDevice.wait(Until.findObject(By.text("Usage")),
+                TIMEOUT));
+        assertNotNull("Data usage bar not found",
+                mDevice.wait(Until.findObject(By.res(SETTINGS_PACKAGE,
+                "color_bar")), TIMEOUT));
+        assertNotNull("WiFi Data usage element not found",
+                mDevice.wait(Until.findObject(By.text("Wi-Fi data usage")),
+                TIMEOUT));
+        assertNotNull("Network restrictions element not found",
+                mDevice.wait(Until.findObject(By.text("Network restrictions")),
+                TIMEOUT));
+    }
+
+    public void launchDataUsageSettings() throws Exception {
+        SettingsHelper.launchSettingsPage(getInstrumentation().getContext(),
+                Settings.ACTION_SETTINGS);
+        mDevice.wait(Until
+                .findObject(By.text("Network & Internet")), TIMEOUT)
+                .click();
+        Thread.sleep(TIMEOUT * 2);
+        assertNotNull("Network & internet screen not loaded", mDevice.wait(
+                Until.findObject(By.text("Data usage")), TIMEOUT));
+        mDevice.wait(Until
+                .findObject(By.text("Data usage")), TIMEOUT)
+                .click();
+    }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/DisplaySettingsTest.java b/tests/uitests/src/com/android/settings/ui/DisplaySettingsTest.java
new file mode 100644
index 0000000..0b7402d
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/DisplaySettingsTest.java
@@ -0,0 +1,268 @@
+/*
+ * 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.ui;
+
+import android.content.ContentResolver;
+import android.platform.test.annotations.Presubmit;
+import android.provider.Settings;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+import android.system.helpers.SettingsHelper;
+import android.system.helpers.SettingsHelper.SettingsType;
+import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.test.suitebuilder.annotation.Suppress;
+
+import java.util.regex.Pattern;
+
+public class DisplaySettingsTest extends InstrumentationTestCase {
+
+    private static final String PAGE = Settings.ACTION_DISPLAY_SETTINGS;
+    private static final int TIMEOUT = 2000;
+    private static final FontSetting FONT_SMALL = new FontSetting("Small", 0.85f);
+    private static final FontSetting FONT_NORMAL = new FontSetting("Default", 1.00f);
+    private static final FontSetting FONT_LARGE = new FontSetting("Large", 1.15f);
+    private static final FontSetting FONT_HUGE = new FontSetting("Largest", 1.30f);
+
+    private UiDevice mDevice;
+    private ContentResolver mResolver;
+    private SettingsHelper mHelper;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        mDevice = UiDevice.getInstance(getInstrumentation());
+        mDevice.setOrientationNatural();
+        mResolver = getInstrumentation().getContext().getContentResolver();
+        mHelper = new SettingsHelper();
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        // reset settings we touched that may impact others
+        Settings.System.putFloat(mResolver, Settings.System.FONT_SCALE, 1.00f);
+        mDevice.waitForIdle();
+        super.tearDown();
+    }
+
+    @Presubmit
+    @MediumTest
+    public void testAdaptiveBrightness() throws Exception {
+        SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), PAGE);
+        mHelper.scrollVert(true);
+        Thread.sleep(1000);
+
+        assertTrue(mHelper.verifyToggleSetting(SettingsType.SYSTEM, PAGE, "Adaptive brightness",
+                Settings.System.SCREEN_BRIGHTNESS_MODE));
+        assertTrue(mHelper.verifyToggleSetting(SettingsType.SYSTEM, PAGE, "Adaptive brightness",
+                Settings.System.SCREEN_BRIGHTNESS_MODE));
+    }
+
+
+    // blocked on b/27487224
+    @MediumTest
+    @Suppress
+    public void testDaydreamToggle() throws Exception {
+        SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), PAGE);
+        clickMore();
+        Pattern p = Pattern.compile("On|Off");
+        mHelper.clickSetting("Screen saver");
+        Thread.sleep(1000);
+        try {
+            assertTrue(mHelper.verifyToggleSetting(SettingsType.SECURE, PAGE, p,
+                    Settings.Secure.SCREENSAVER_ENABLED, false));
+            assertTrue(mHelper.verifyToggleSetting(SettingsType.SECURE, PAGE, p,
+                    Settings.Secure.SCREENSAVER_ENABLED, false));
+        } finally {
+            mDevice.pressBack();
+        }
+    }
+
+    @MediumTest
+    public void testAccelRotation() throws Exception {
+        SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), PAGE);
+        mHelper.scrollVert(true);
+        clickMore();
+        Thread.sleep(4000);
+        int currentAccelSetting = Settings.System.getInt(
+                mResolver, Settings.System.ACCELEROMETER_ROTATION);
+        mHelper.clickSetting("Auto-rotate screen");
+        int newAccelSetting = Settings.System.getInt(
+                mResolver, Settings.System.ACCELEROMETER_ROTATION);
+        assertTrue("Accelorometer setting unchanged after toggle", currentAccelSetting != newAccelSetting);
+        mHelper.clickSetting("Auto-rotate screen");
+        int revertedAccelSetting = Settings.System.getInt(
+                mResolver, Settings.System.ACCELEROMETER_ROTATION);
+        assertTrue("Accelorometer setting unchanged after toggle", revertedAccelSetting != newAccelSetting);
+    }
+
+    @MediumTest
+    public void testDaydream() throws Exception {
+        Settings.Secure.putInt(mResolver, Settings.Secure.SCREENSAVER_ENABLED, 1);
+        SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), PAGE);
+        clickMore();
+        mHelper.scrollVert(false);
+        mDevice.wait(Until.findObject(By.text("Screen saver")), TIMEOUT).click();
+        try {
+            assertTrue(mHelper.verifyRadioSetting(SettingsType.SECURE, PAGE,
+                    "Current screen saver", "Clock", Settings.Secure.SCREENSAVER_COMPONENTS,
+                    "com.google.android.deskclock/com.android.deskclock.Screensaver"));
+            assertTrue(mHelper.verifyRadioSetting(SettingsType.SECURE, PAGE,
+                    "Current screen saver", "Colors", Settings.Secure.SCREENSAVER_COMPONENTS,
+                    "com.android.dreams.basic/com.android.dreams.basic.Colors"));
+            assertTrue(mHelper.verifyRadioSetting(SettingsType.SECURE, PAGE,
+                    "Current screen saver", "Photos", Settings.Secure.SCREENSAVER_COMPONENTS,
+                    "com.google.android.apps.photos/com.google.android.apps.photos.daydream"
+                            + ".PhotosDreamService"));
+        } finally {
+            mDevice.pressBack();
+            Thread.sleep(2000);
+        }
+    }
+
+    @Presubmit
+    @MediumTest
+    public void testSleep15Seconds() throws Exception {
+        SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), PAGE);
+        mHelper.scrollVert(true);
+        assertTrue(mHelper.verifyRadioSetting(SettingsType.SYSTEM, PAGE,
+                "Sleep", "15 seconds", Settings.System.SCREEN_OFF_TIMEOUT, "15000"));
+    }
+
+    @MediumTest
+    public void testSleep30Seconds() throws Exception {
+        SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), PAGE);
+        mHelper.scrollVert(true);
+        assertTrue(mHelper.verifyRadioSetting(SettingsType.SYSTEM, PAGE,
+                "Sleep", "30 seconds", Settings.System.SCREEN_OFF_TIMEOUT, "30000"));
+    }
+
+    @MediumTest
+    public void testSleep1Minute() throws Exception {
+        SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), PAGE);
+        mHelper.scrollVert(true);
+        assertTrue(mHelper.verifyRadioSetting(SettingsType.SYSTEM, PAGE,
+                "Sleep", "1 minute", Settings.System.SCREEN_OFF_TIMEOUT, "60000"));
+    }
+
+    @MediumTest
+    public void testSleep2Minutes() throws Exception {
+        SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), PAGE);
+        mHelper.scrollVert(true);
+        assertTrue(mHelper.verifyRadioSetting(SettingsType.SYSTEM, PAGE,
+                "Sleep", "2 minutes", Settings.System.SCREEN_OFF_TIMEOUT, "120000"));
+    }
+
+    @MediumTest
+    public void testSleep5Minutes() throws Exception {
+        SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), PAGE);
+        mHelper.scrollVert(true);
+        assertTrue(mHelper.verifyRadioSetting(SettingsType.SYSTEM, PAGE,
+                "Sleep", "5 minutes", Settings.System.SCREEN_OFF_TIMEOUT, "300000"));
+    }
+
+    @MediumTest
+    public void testSleep10Minutes() throws Exception {
+        SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), PAGE);
+        mHelper.scrollVert(true);
+        assertTrue(mHelper.verifyRadioSetting(SettingsType.SYSTEM, PAGE,
+                "Sleep", "10 minutes", Settings.System.SCREEN_OFF_TIMEOUT, "600000"));
+    }
+
+    @MediumTest
+    public void testSleep30Minutes() throws Exception {
+        SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), PAGE);
+        mHelper.scrollVert(true);
+        assertTrue(mHelper.verifyRadioSetting(SettingsType.SYSTEM, PAGE,
+                "Sleep", "30 minutes", Settings.System.SCREEN_OFF_TIMEOUT, "1800000"));
+    }
+
+    @Presubmit
+    @MediumTest
+    public void testFontSizeLarge() throws Exception {
+        verifyFontSizeSetting(1.00f, FONT_LARGE);
+        // Leaving the font size at large can make later tests fail, so reset it
+        Settings.System.putFloat(mResolver, Settings.System.FONT_SCALE, 1.00f);
+        // It takes a second for the new font size to be picked up
+        Thread.sleep(2000);
+    }
+
+    @MediumTest
+    public void testFontSizeDefault() throws Exception {
+        verifyFontSizeSetting(1.15f, FONT_NORMAL);
+    }
+
+    @MediumTest
+    public void testFontSizeLargest() throws Exception {
+        verifyFontSizeSetting(1.00f, FONT_HUGE);
+        // Leaving the font size at huge can make later tests fail, so reset it
+        Settings.System.putFloat(mResolver, Settings.System.FONT_SCALE, 1.00f);
+        // It takes a second for the new font size to be picked up
+        Thread.sleep(2000);
+    }
+
+    @MediumTest
+    public void testFontSizeSmall() throws Exception {
+        verifyFontSizeSetting(1.00f, FONT_SMALL);
+    }
+
+    private void verifyFontSizeSetting(float resetValue, FontSetting setting)
+            throws Exception {
+        Settings.System.putFloat(mResolver, Settings.System.FONT_SCALE, resetValue);
+        SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), PAGE);
+        clickMore();
+        mHelper.clickSetting("Font size");
+        try {
+            mDevice.wait(Until.findObject(By.desc(setting.getName())), TIMEOUT).click();
+            Thread.sleep(1000);
+            float changedValue = Settings.System.getFloat(
+                    mResolver, Settings.System.FONT_SCALE);
+            assertEquals(setting.getSize(), changedValue, 0.0001);
+        } finally {
+            // Make sure to back out of the font menu
+            mDevice.pressBack();
+        }
+    }
+
+    private void clickMore() throws InterruptedException {
+        UiObject2 more = mDevice.wait(Until.findObject(By.text("Advanced")), TIMEOUT);
+        if (more != null) {
+            more.click();
+            Thread.sleep(TIMEOUT);
+        }
+    }
+
+    private static class FontSetting {
+        private final String mSizeName;
+        private final float mSizeVal;
+
+        public FontSetting(String sizeName, float sizeVal) {
+            mSizeName = sizeName;
+            mSizeVal = sizeVal;
+        }
+
+        public String getName() {
+            return mSizeName;
+        }
+
+        public float getSize() {
+            return mSizeVal;
+        }
+    }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/HomepageDisplayTests.java b/tests/uitests/src/com/android/settings/ui/HomepageDisplayTests.java
new file mode 100644
index 0000000..7931d30
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/HomepageDisplayTests.java
@@ -0,0 +1,99 @@
+/*
+ * 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.ui;
+
+import android.os.RemoteException;
+import android.platform.test.annotations.Presubmit;
+import android.provider.Settings;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.Direction;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+import android.system.helpers.SettingsHelper;
+
+import com.android.settings.ui.testutils.SettingsTestUtils;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static com.android.settings.ui.testutils.SettingsTestUtils.SETTINGS_PACKAGE;
+import static com.android.settings.ui.testutils.SettingsTestUtils.TIMEOUT;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class HomepageDisplayTests {
+
+    private static final String[] HOMEPAGE_ITEMS = {
+            "Network & internet",
+            "Connected devices",
+            "Apps & notifications",
+            "Battery",
+            "Display",
+            "Sound",
+            "Storage",
+            "Security & location",
+            "Users & accounts",
+            "Accessibility",
+            "System",
+            "Support & tips"
+    };
+
+    private UiDevice mDevice;
+    private SettingsHelper mSettingsHelper;
+
+    @Before
+    public void setUp() throws Exception {
+        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+        mSettingsHelper = new SettingsHelper();
+        try {
+            mDevice.setOrientationNatural();
+        } catch (RemoteException e) {
+            throw new RuntimeException("failed to freeze device orientaion", e);
+        }
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        // Need to finish settings activity
+        mDevice.pressHome();
+    }
+
+    @Presubmit
+    @Test
+    public void testHomepageCategory() throws Exception {
+        // Launch Settings
+        SettingsHelper.launchSettingsPage(
+                InstrumentationRegistry.getContext(), Settings.ACTION_SETTINGS);
+
+        // Scroll to top
+        final UiObject2 view = mDevice.wait(
+                Until.findObject(By.res(SETTINGS_PACKAGE, "main_content")),
+                TIMEOUT);
+        view.scroll(Direction.UP, 100f);
+
+        // Inspect each item
+        for (String item : HOMEPAGE_ITEMS) {
+            SettingsTestUtils.assertTitleMatch(mDevice, item);
+        }
+    }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/LocationSettingsTests.java b/tests/uitests/src/com/android/settings/ui/LocationSettingsTests.java
new file mode 100644
index 0000000..b4a1baa
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/LocationSettingsTests.java
@@ -0,0 +1,243 @@
+/*
+ * 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.ui;
+
+import android.os.RemoteException;
+import android.platform.test.annotations.Presubmit;
+import android.provider.Settings;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.Direction;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+import android.system.helpers.SettingsHelper;
+import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+
+
+public class LocationSettingsTests extends InstrumentationTestCase {
+
+    private static final String SETTINGS_PACKAGE = "com.android.settings";
+    private static final int TIMEOUT = 2000;
+    private UiDevice mDevice;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        mDevice = UiDevice.getInstance(getInstrumentation());
+        try {
+            mDevice.setOrientationNatural();
+        } catch (RemoteException e) {
+            throw new RuntimeException("failed to freeze device orientaion", e);
+        }
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        mDevice.pressBack();
+        mDevice.pressHome();
+        super.tearDown();
+    }
+
+    @MediumTest
+    public void testLoadingLocationSettings () throws Exception {
+        // Load Security
+        SettingsHelper.launchSettingsPage(getInstrumentation().getContext(),
+                Settings.ACTION_SECURITY_SETTINGS);
+
+        SettingsHelper helper = new SettingsHelper();
+        helper.scrollVert(true);
+        // Tap on location
+        UiObject2 settingsPanel = mDevice.wait(Until.findObject
+                (By.res(SETTINGS_PACKAGE, "main_content")), TIMEOUT);
+        int count = 0;
+        UiObject2 locationTitle = null;
+        while(count < 6 && locationTitle == null) {
+            locationTitle = mDevice.wait(Until.findObject(By.text("Location")), TIMEOUT);
+            if (locationTitle == null) {
+                settingsPanel.scroll(Direction.DOWN, 1.0f);
+            }
+            count++;
+        }
+        // Verify location settings loads.
+        locationTitle.click();
+        Thread.sleep(TIMEOUT);
+        assertNotNull("Location screen has not loaded correctly",
+                mDevice.wait(Until.findObject(By.text("Location services")), TIMEOUT));
+    }
+
+    @Presubmit
+    @MediumTest
+    public void testLocationSettingOn() throws Exception {
+        verifyLocationSettingsOnOrOff(true);
+    }
+
+    @MediumTest
+    public void testLocationSettingOff() throws Exception {
+        verifyLocationSettingsOnOrOff(false);
+    }
+
+    @MediumTest
+    public void testLocationDeviceOnlyMode() throws Exception {
+        // Changing the value from default before testing the toggle to Device only mode
+        Settings.Secure.putInt(getInstrumentation().getContext().getContentResolver(),
+                Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_HIGH_ACCURACY);
+        dismissAlertDialogs();
+        Thread.sleep(TIMEOUT);
+        verifyLocationSettingsMode(Settings.Secure.LOCATION_MODE_SENSORS_ONLY);
+    }
+
+    @MediumTest
+    public void testLocationBatterySavingMode() throws Exception {
+        Settings.Secure.putInt(getInstrumentation().getContext().getContentResolver(),
+                Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_SENSORS_ONLY);
+        Thread.sleep(TIMEOUT);
+        verifyLocationSettingsMode(Settings.Secure.LOCATION_MODE_BATTERY_SAVING);
+    }
+
+    @MediumTest
+    public void testLocationHighAccuracyMode() throws Exception {
+        Settings.Secure.putInt(getInstrumentation().getContext().getContentResolver(),
+                Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_SENSORS_ONLY);
+        Thread.sleep(TIMEOUT);
+        verifyLocationSettingsMode(Settings.Secure.LOCATION_MODE_HIGH_ACCURACY);
+    }
+
+    @MediumTest
+    public void testLocationSettingsElements() throws Exception {
+        String[] textElements = {"Location", "Mode", "Recent location requests",
+                "Location services"};
+        SettingsHelper.launchSettingsPage(getInstrumentation().getContext(),
+                Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+        Thread.sleep(TIMEOUT);
+        for (String element : textElements) {
+            assertNotNull(element + " item not found under Location Settings",
+                    mDevice.wait(Until.findObject(By.text(element)), TIMEOUT));
+        }
+    }
+
+    @MediumTest
+    public void testLocationSettingsOverflowMenuElements() throws Exception {
+        SettingsHelper.launchSettingsPage(getInstrumentation().getContext(),
+                            Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+        // Verify help & feedback
+        assertNotNull("Help & feedback item not found under Location Settings",
+                mDevice.wait(Until.findObject(By.desc("Help & feedback")), TIMEOUT));
+        // Verify scanning
+        assertNotNull("Scanning item not found under Location Settings",
+                mDevice.wait(Until.findObject(By.text("Scanning")), TIMEOUT));
+    }
+
+    private void verifyLocationSettingsMode(int mode) throws Exception {
+        int modeIntValue = 1;
+        String textMode = "Device only";
+        if (mode == Settings.Secure.LOCATION_MODE_HIGH_ACCURACY) {
+            modeIntValue = 3;
+            textMode = "High accuracy";
+        }
+        else if (mode == Settings.Secure.LOCATION_MODE_BATTERY_SAVING) {
+            modeIntValue = 2;
+            textMode = "Battery saving";
+        }
+        // Load location settings
+        SettingsHelper.launchSettingsPage(getInstrumentation().getContext(),
+                Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+        // Tap on mode
+        dismissAlertDialogs();
+        // Load location settings
+        mDevice.wait(Until.findObject(By.text("Mode")), TIMEOUT).click();
+        Thread.sleep(TIMEOUT);
+        assertNotNull("Location mode screen not loaded", mDevice.wait(Until.findObject
+                (By.text("Location mode")), TIMEOUT));
+        // Choose said mode
+        mDevice.wait(Until.findObject(By.text(textMode)), TIMEOUT).click();
+        Thread.sleep(TIMEOUT);
+        dismissAlertDialogs();
+        mDevice.wait(Until.findObject(By.desc("Navigate up")), TIMEOUT).click();
+        Thread.sleep(TIMEOUT);
+        if (mode == Settings.Secure.LOCATION_MODE_HIGH_ACCURACY ||
+                mode == Settings.Secure.LOCATION_MODE_BATTERY_SAVING) {
+            dismissAlertDialogs();
+        }
+        // get setting and verify value
+        // Verify change of mode
+        int locationSettingMode =
+                Settings.Secure.getInt(getInstrumentation().getContext().getContentResolver(),
+                Settings.Secure.LOCATION_MODE);
+        assertEquals(mode + " value not set correctly for location.", modeIntValue,
+                locationSettingMode);
+    }
+
+    private void verifyLocationSettingsOnOrOff(boolean verifyOn) throws Exception {
+        // Set location flag
+        if (verifyOn) {
+            Settings.Secure.putInt(getInstrumentation().getContext().getContentResolver(),
+                    Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF);
+        }
+        else {
+            Settings.Secure.putInt(getInstrumentation().getContext().getContentResolver(),
+                    Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_HIGH_ACCURACY);
+        }
+        dismissAlertDialogs();
+        // Load location settings
+        SettingsHelper.launchSettingsPage(getInstrumentation().getContext(),
+                Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+        dismissAlertDialogs();
+        // Toggle UI
+        mDevice.wait(Until.findObject(By.res(SETTINGS_PACKAGE, "switch_widget")), TIMEOUT).click();
+        dismissAlertDialogs();
+        Thread.sleep(TIMEOUT);
+        // Verify change in setting
+        int locationEnabled = Settings.Secure.getInt(getInstrumentation()
+                 .getContext().getContentResolver(),
+                 Settings.Secure.LOCATION_MODE);
+        if (verifyOn) {
+            assertFalse("Location not enabled correctly", locationEnabled == 0);
+        }
+        else {
+            assertEquals("Location not disabled correctly", 0, locationEnabled);
+        }
+    }
+
+    // This method dismisses both alert dialogs that might popup and
+    // interfere with the test. Since the order in which the dialog
+    // shows up changes in no specific known way, we're checking for
+    // both dialogs in any order for a robust test. Bug b/36233151
+    // filed against Location team for specifications. This is a
+    // workaround in the meantime to ensure coverage.
+    private void dismissAlertDialogs() throws Exception {
+        for (int count = 0; count < 2; count++) {
+            UiObject2 agreeDialog = mDevice.wait(Until.findObject
+                    (By.text("Improve location accuracy?")), TIMEOUT);
+            UiObject2 previousChoiceYesButton = mDevice.wait(Until.findObject
+                    (By.text("YES")), TIMEOUT);
+            if (agreeDialog != null) {
+                mDevice.wait(Until.findObject
+                        (By.text("AGREE")), TIMEOUT).click();
+                Thread.sleep(TIMEOUT);
+                assertNull("Improve location dialog not dismissed",
+                        mDevice.wait(Until.findObject
+                        (By.text("Improve location accuracy?")), TIMEOUT));
+            }
+            if (previousChoiceYesButton != null) {
+                previousChoiceYesButton.click();
+                // Short sleep to wait for the new screen
+                Thread.sleep(TIMEOUT);
+            }
+        }
+    }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTests.java b/tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTests.java
new file mode 100644
index 0000000..2523686
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTests.java
@@ -0,0 +1,126 @@
+/*
+ * 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.ui;
+
+import android.os.RemoteException;
+import android.platform.test.annotations.Presubmit;
+import android.provider.Settings;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+import android.system.helpers.SettingsHelper;
+import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+
+
+public class MoreWirelessSettingsTests extends InstrumentationTestCase {
+
+    private static final String SETTINGS_PACKAGE = "com.android.settings";
+    private static final int TIMEOUT = 2000;
+    private UiDevice mDevice;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        mDevice = UiDevice.getInstance(getInstrumentation());
+        try {
+            mDevice.setOrientationNatural();
+        } catch (RemoteException e) {
+            throw new RuntimeException("failed to freeze device orientaion", e);
+        }
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        mDevice.pressBack();
+        mDevice.pressHome();
+        super.tearDown();
+    }
+
+    @Presubmit
+    @MediumTest
+    public void testAirplaneModeEnabled() throws Exception {
+        verifyAirplaneModeOnOrOff(true);
+        // Toggling this via the wifi network settings page
+        // because of bug b/34858716. Once that is fixed,
+        // we should be able to set this via Settings putString.
+        toggleAirplaneModeSwitch();
+    }
+
+    @Presubmit
+    @MediumTest
+    public void testAirplaneModeDisabled() throws Exception {
+        verifyAirplaneModeOnOrOff(false);
+    }
+
+    @MediumTest
+    public void testTetheringMenuLoad() throws Exception {
+        SettingsHelper.launchSettingsPage(getInstrumentation().getContext(),
+                Settings.ACTION_WIRELESS_SETTINGS);
+        mDevice.wait(Until
+                 .findObject(By.text("Hotspot & tethering")), TIMEOUT)
+                 .click();
+        Thread.sleep(TIMEOUT);
+        UiObject2 usbTethering = mDevice.wait(Until
+                 .findObject(By.text("USB tethering")), TIMEOUT);
+        assertNotNull("Tethering screen did not load correctly", usbTethering);
+    }
+
+    @MediumTest
+    public void testVPNMenuLoad() throws Exception {
+        SettingsHelper.launchSettingsPage(getInstrumentation().getContext(),
+                Settings.ACTION_WIRELESS_SETTINGS);
+        mDevice.wait(Until
+                 .findObject(By.text("VPN")), TIMEOUT)
+                 .click();
+        Thread.sleep(TIMEOUT);
+        UiObject2 usbTethering = mDevice.wait(Until
+                 .findObject(By.res(SETTINGS_PACKAGE, "vpn_create")), TIMEOUT);
+        assertNotNull("VPN screen did not load correctly", usbTethering);
+    }
+
+    private void verifyAirplaneModeOnOrOff(boolean verifyOn) throws Exception {
+        if (verifyOn) {
+            Settings.Global.putString(getInstrumentation().getContext().getContentResolver(),
+                    Settings.Global.AIRPLANE_MODE_ON, "0");
+        }
+        else {
+            Settings.Global.putString(getInstrumentation().getContext().getContentResolver(),
+                    Settings.Global.AIRPLANE_MODE_ON, "1");
+        }
+        toggleAirplaneModeSwitch();
+        String airplaneModeValue = Settings.Global
+                .getString(getInstrumentation().getContext().getContentResolver(),
+                Settings.Global.AIRPLANE_MODE_ON);
+        if (verifyOn) {
+            assertEquals("1", airplaneModeValue);
+        }
+        else {
+            assertEquals("0", airplaneModeValue);
+        }
+    }
+
+    private void toggleAirplaneModeSwitch() throws Exception {
+        SettingsHelper.launchSettingsPage(getInstrumentation().getContext(),
+                Settings.ACTION_WIRELESS_SETTINGS);
+        mDevice.wait(Until
+                .findObject(By.text("Airplane mode")), TIMEOUT)
+                .click();
+        Thread.sleep(TIMEOUT);
+    }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/NotificationSettingsTests.java b/tests/uitests/src/com/android/settings/ui/NotificationSettingsTests.java
new file mode 100644
index 0000000..133332c
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/NotificationSettingsTests.java
@@ -0,0 +1,158 @@
+/*
+ * 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.ui;
+
+import android.content.Intent;
+import android.os.RemoteException;
+import android.provider.Settings;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.BySelector;
+import android.support.test.uiautomator.Direction;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+import android.system.helpers.ActivityHelper;
+import android.system.helpers.SettingsHelper;
+import android.widget.ListView;
+import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.util.Log;
+
+/** Verifies that you can get to the notification app listing page from the apps & notifications
+ * page */
+public class NotificationSettingsTests extends InstrumentationTestCase {
+    private static final boolean LOCAL_LOGV = false;
+    private static final String TAG = "NotifiSettingsTests";
+    private static final int TIMEOUT = 2000;
+    private ActivityHelper mActivityHelper = null;
+    private SettingsHelper mSettingsHelper = null;
+
+    private UiDevice mDevice;
+    @Override
+    public void setUp() throws Exception {
+        if (LOCAL_LOGV) {
+            Log.d(TAG, "-------");
+        }
+        super.setUp();
+        mDevice = UiDevice.getInstance(getInstrumentation());
+        mActivityHelper = ActivityHelper.getInstance();
+        mSettingsHelper = SettingsHelper.getInstance();
+        try {
+            mDevice.setOrientationNatural();
+        } catch (RemoteException e) {
+            throw new RuntimeException("Failed to freeze device orientaion", e);
+        }
+
+        // make sure we are in a clean state before starting the test
+        mDevice.pressHome();
+        Thread.sleep(TIMEOUT * 2);
+        launchAppsSettings();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        mDevice.pressBack();
+        mDevice.pressHome(); // finish settings activity
+        mDevice.waitForIdle(TIMEOUT * 2); // give UI time to finish animating
+        super.tearDown();
+    }
+
+    @MediumTest
+    public void testNotificationsSettingsListForCalculator() {
+        UiObject2 configureNotifications = mDevice.wait(
+                Until.findObject(By.text("Notifications")), TIMEOUT);
+        configureNotifications.click();
+        mDevice.wait(Until.findObject(By.text("Blink light")), TIMEOUT);
+        UiObject2 appNotifications = mDevice.wait(
+                Until.findObject(By.text("On for all apps")), TIMEOUT);
+        appNotifications.click();
+        UiObject2 view =
+                mDevice.wait(
+                        Until.findObject(By.text("All apps")), TIMEOUT);
+        assertNotNull("Could not find Settings > Apps screen", view);
+        UiObject2 app = mDevice.wait(Until.findObject(By.text("Calculator")), TIMEOUT);
+        assertNotNull("Could not find Calculator notification settings", app);
+    }
+
+
+    @MediumTest
+    public void testNotificationsSettingsListForPhone() {
+        UiObject2 configureNotifications = mDevice.wait(
+                Until.findObject(By.text("Notifications")), TIMEOUT);
+        configureNotifications.click();
+        mDevice.wait(Until.findObject(By.text("Blink light")), TIMEOUT);
+        UiObject2 appNotifications = mDevice.wait(
+                Until.findObject(By.text("On for all apps")), TIMEOUT);
+        appNotifications.click();
+        UiObject2 view =
+                mDevice.wait(
+                        Until.findObject(By.text("All apps")), TIMEOUT);
+        assertNotNull("Could not find Settings > Apps screen", view);
+
+        final BySelector preferenceListSelector = By.clazz(ListView.class).res("android:id/list");
+        UiObject2 apps = mDevice.wait(Until.findObject(preferenceListSelector), TIMEOUT);
+
+        UiObject2 phone = scrollTo(mDevice, apps, By.text("Phone"), Direction.DOWN);
+        assertNotNull("Could not find Phone notification settings", phone);
+        phone.click();
+        UiObject2 incomingCalls = mDevice.wait(Until.findObject(By.text("Incoming calls")), TIMEOUT);
+        assertNotNull("Could not find incoming calls channel", incomingCalls);
+        incomingCalls.click();
+
+        // here's the meat of this test: make sure that you cannot change
+        // most settings for this channel
+
+        UiObject2 importance = mDevice.wait(Until.findObject(By.text("Importance")), TIMEOUT);
+        assertNotNull("Could not find importance toggle", importance);
+        assertFalse(importance.isEnabled());
+        assertFalse(mDevice.wait(Until.findObject(By.text("Sound")), TIMEOUT).isEnabled());;
+        assertFalse(mDevice.wait(Until.findObject(By.text("Vibrate")), TIMEOUT).isEnabled());
+        assertFalse(mDevice.wait(Until.findObject(By.text("Override Do Not Disturb")), TIMEOUT).isEnabled());
+
+
+
+
+
+
+    }
+
+    private UiObject2 scrollTo(UiDevice device, UiObject2 scrollable,
+                                          BySelector target, Direction direction) {
+        while (!device.hasObject(target) && scrollable.scroll(direction, 1.0f)) {
+            // continue
+        }
+        if (!device.hasObject(target)) {
+            // Scroll once more if not found; in some cases UiObject2.scroll can return false when
+            // the last item is not fully visible yet for list views.
+            scrollable.scroll(direction, 1.0f);
+        }
+        return device.findObject(target);
+    }
+
+
+    private void launchAppsSettings() throws Exception {
+        Intent appsSettingsIntent = new Intent(Settings.ACTION_SETTINGS);
+        mActivityHelper.launchIntent(appsSettingsIntent);
+        mSettingsHelper.flingSettingsToStart();
+        UiObject2 view = mDevice.wait(
+                Until.findObject(By.text("Apps & notifications")), TIMEOUT);
+        view.click();
+        UiObject2 title = mDevice.wait(
+                Until.findObject(By.text("Apps & notifications")), TIMEOUT);
+        assertNotNull("Could not find Settings > Apps & notifications screen", title);
+    }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/SecuritySettingsLaunchTest.java b/tests/uitests/src/com/android/settings/ui/SecuritySettingsLaunchTest.java
new file mode 100644
index 0000000..b730690
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/SecuritySettingsLaunchTest.java
@@ -0,0 +1,75 @@
+/*
+ * 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.ui;
+
+import android.os.RemoteException;
+import android.provider.Settings;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.UiDevice;
+import android.system.helpers.SettingsHelper;
+
+import com.android.settings.ui.testutils.SettingsTestUtils;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class SecuritySettingsLaunchTest {
+
+    // Items we really want to always show
+    private static final String[] CATEGORIES = new String[]{
+            "Security status",
+            "Device security",
+            "Privacy",
+    };
+
+    private UiDevice mDevice;
+    private SettingsHelper mHelper;
+
+    @Before
+    public void setUp() throws Exception {
+        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+        mHelper = SettingsHelper.getInstance();
+        try {
+            mDevice.setOrientationNatural();
+        } catch (RemoteException e) {
+            throw new RuntimeException("failed to freeze device orientaion", e);
+        }
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        // Go back to home for next test.
+        mDevice.pressHome();
+    }
+
+    @Test
+    public void launchSecuritySettings() throws Exception {
+        // Launch Settings
+        SettingsHelper.launchSettingsPage(
+                InstrumentationRegistry.getContext(), Settings.ACTION_SECURITY_SETTINGS);
+        mHelper.scrollVert(false);
+        for (String category : CATEGORIES) {
+            SettingsTestUtils.assertTitleMatch(mDevice, category);
+        }
+    }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/SoundSettingsTest.java b/tests/uitests/src/com/android/settings/ui/SoundSettingsTest.java
new file mode 100644
index 0000000..0aec505
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/SoundSettingsTest.java
@@ -0,0 +1,334 @@
+/*
+ * 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.ui;
+
+import android.app.NotificationManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.os.Handler;
+import android.os.SystemClock;
+import android.provider.Settings;
+import android.service.notification.ZenModeConfig;
+import android.support.test.uiautomator.UiObject2;
+import android.system.helpers.SettingsHelper;
+import android.system.helpers.SettingsHelper.SettingsType;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.Until;
+import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.test.suitebuilder.annotation.Suppress;
+
+import java.util.HashMap;
+
+public class SoundSettingsTest extends InstrumentationTestCase {
+    private static final String PAGE = Settings.ACTION_SOUND_SETTINGS;
+    private static final int TIMEOUT = 2000;
+
+    private UiDevice mDevice;
+    private ContentResolver mResolver;
+    private SettingsHelper mHelper;
+
+
+    private HashMap ringtoneSounds = new HashMap<String, String>() {{
+        put("angler","Dione");
+        put("bullhead","Dione");
+        put("marlin","Spaceship");
+        put("sailfish","Spaceship");
+        put("walleye","Copycat");
+        put("taimen","Copycat");
+    }};
+
+    private HashMap ringtoneCodes = new HashMap<String, String>() {{
+        put("angler","38");
+        put("bullhead","38");
+        put("marlin","37");
+        put("sailfish","37");
+        put("walleye","26");
+        put("taimen","26");
+    }};
+
+    private HashMap alarmSounds = new HashMap<String, String>() {{
+        put("angler","Awaken");
+        put("bullhead","Awaken");
+        put("marlin","Bounce");
+        put("sailfish","Bounce");
+        put("walleye","Cuckoo clock");
+        put("taimen","Cuckoo clock");
+    }};
+
+    private HashMap alarmCodes = new HashMap<String, String>() {{
+        put("angler","6");
+        put("bullhead","6");
+        put("marlin","49");
+        put("sailfish","49");
+        put("walleye","15");
+        put("taimen","15");
+    }};
+
+    private HashMap notificationSounds = new HashMap<String, String>() {{
+        put("angler","Ceres");
+        put("bullhead","Ceres");
+        put("marlin","Trill");
+        put("sailfish","Trill");
+        put("walleye","Pipes");
+        put("taimen","Pipes");
+    }};
+
+
+    private HashMap notificationCodes = new HashMap<String, String>() {{
+        put("angler","26");
+        put("bullhead","26");
+        put("marlin","57");
+        put("sailfish","57");
+        put("walleye","69");
+        put("taimen","69");
+    }};
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        mDevice = UiDevice.getInstance(getInstrumentation());
+        mDevice.setOrientationNatural();
+        mResolver = getInstrumentation().getContext().getContentResolver();
+        mHelper = new SettingsHelper();
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        mDevice.pressBack();
+        mDevice.pressHome();
+        mDevice.waitForIdle();
+        mDevice.unfreezeRotation();
+        super.tearDown();
+    }
+
+    @MediumTest
+    public void testCallVibrate() throws Exception {
+        assertTrue(mHelper.verifyToggleSetting(SettingsType.SYSTEM, PAGE,
+                "Also vibrate for calls", Settings.System.VIBRATE_WHEN_RINGING));
+        assertTrue(mHelper.verifyToggleSetting(SettingsType.SYSTEM, PAGE,
+                "Also vibrate for calls", Settings.System.VIBRATE_WHEN_RINGING));
+    }
+
+    @MediumTest
+    public void testOtherSoundsDialPadTones() throws Exception {
+        loadOtherSoundsPage();
+        assertTrue("Dial pad tones not toggled", mHelper.verifyToggleSetting(
+                SettingsType.SYSTEM, PAGE, "Dial pad tones",
+                Settings.System.DTMF_TONE_WHEN_DIALING));
+    }
+
+    @MediumTest
+    public void testOtherSoundsScreenLocking() throws Exception {
+        loadOtherSoundsPage();
+        assertTrue("Screen locking sounds not toggled",
+                    mHelper.verifyToggleSetting(SettingsType.SYSTEM, PAGE,
+                    "Screen locking sounds", Settings.System.LOCKSCREEN_SOUNDS_ENABLED));
+    }
+
+    @MediumTest
+    public void testOtherSoundsCharging() throws Exception {
+        loadOtherSoundsPage();
+        assertTrue("Charging sounds not toggled",
+                    mHelper.verifyToggleSetting(SettingsType.GLOBAL, PAGE,
+                    "Charging sounds", Settings.Global.CHARGING_SOUNDS_ENABLED));
+    }
+
+    @MediumTest
+    public void testOtherSoundsTouch() throws Exception {
+        loadOtherSoundsPage();
+        assertTrue("Touch sounds not toggled",
+                    mHelper.verifyToggleSetting(SettingsType.SYSTEM, PAGE,
+                    "Touch sounds", Settings.System.SOUND_EFFECTS_ENABLED));
+    }
+
+    @MediumTest
+    public void testOtherSoundsVibrateOnTap() throws Exception {
+        loadOtherSoundsPage();
+        assertTrue("Vibrate on tap not toggled",
+                    mHelper.verifyToggleSetting(SettingsType.SYSTEM, PAGE,
+                    "Vibrate on tap", Settings.System.HAPTIC_FEEDBACK_ENABLED));
+    }
+
+    private void loadOtherSoundsPage() throws Exception {
+        launchSoundSettings();
+        mHelper.scrollVert(false);
+        Thread.sleep(1000);
+    }
+
+    private void launchSoundSettings() throws Exception {
+        SettingsHelper.launchSettingsPage(getInstrumentation().getContext(), PAGE);
+        mHelper.scrollVert(false);
+        clickMore();
+        Thread.sleep(1000);
+        mHelper.scrollVert(true);
+        Thread.sleep(1000);
+    }
+
+    /*
+     * Rather than verifying every ringtone, verify the ones least likely to change
+     * (None and Hangouts) and an arbitrary one from the ringtone pool.
+     */
+    @MediumTest
+    public void testPhoneRingtoneNone() throws Exception {
+        launchSoundSettings();
+        mHelper.clickSetting("Phone ringtone");
+        verifyRingtone(new RingtoneSetting("None", "null"),
+                Settings.System.RINGTONE);
+    }
+
+    @MediumTest
+    @Suppress
+    public void testPhoneRingtoneHangouts() throws Exception {
+        launchSoundSettings();
+        mHelper.clickSetting("Phone ringtone");
+        verifyRingtone(new RingtoneSetting("Hangouts Call", "31"), Settings.System.RINGTONE);
+    }
+
+    @MediumTest
+    public void testPhoneRingtone() throws Exception {
+        launchSoundSettings();
+        mHelper.clickSetting("Phone ringtone");
+        String ringtone = ringtoneSounds.get(mDevice.getProductName()).toString();
+        String ringtoneSettingValue = ringtoneCodes.get(mDevice.getProductName()).toString();
+        verifyRingtone(new RingtoneSetting(ringtone, ringtoneSettingValue),
+                Settings.System.RINGTONE);
+    }
+
+    @MediumTest
+    public void testNotificationRingtoneNone() throws Exception {
+        launchSoundSettings();
+        mHelper.clickSetting("Default notification sound");
+        verifyRingtone(new RingtoneSetting("None", "null"),
+                Settings.System.NOTIFICATION_SOUND);
+    }
+
+    @MediumTest
+    @Suppress
+    public void testNotificationRingtoneHangouts() throws Exception {
+        launchSoundSettings();
+        mHelper.clickSetting("Default notification sound");
+        verifyRingtone(new RingtoneSetting("Hangouts Message", "30"),
+                Settings.System.NOTIFICATION_SOUND);
+    }
+
+    @MediumTest
+    public void testNotificationRingtone() throws Exception {
+        launchSoundSettings();
+        mHelper.clickSetting("Default notification sound");
+        String notificationRingtone = notificationSounds.get(mDevice.getProductName()).toString();
+        String notificationSettingValue = notificationCodes.get(mDevice.getProductName()).toString();
+        verifyRingtone(new RingtoneSetting(notificationRingtone, notificationSettingValue),
+                Settings.System.NOTIFICATION_SOUND);
+    }
+
+    @MediumTest
+    public void testAlarmRingtoneNone() throws Exception {
+        launchSoundSettings();
+        mHelper.clickSetting("Default alarm sound");
+        verifyRingtone(new RingtoneSetting("None", "null"),
+                Settings.System.ALARM_ALERT);
+    }
+
+    @MediumTest
+    public void testAlarmRingtone() throws Exception {
+        launchSoundSettings();
+        String alarmRingtone = alarmSounds.get(mDevice.getProductName()).toString();
+        String alarmSettingValue = alarmCodes.get(mDevice.getProductName()).toString();
+        mHelper.clickSetting("Default alarm sound");
+        verifyRingtone(new RingtoneSetting(alarmRingtone, alarmSettingValue),
+                Settings.System.ALARM_ALERT);
+    }
+
+    /*
+     * This method verifies that setting a custom ringtone changes the
+     * ringtone code setting on the system. Each ringtone sound corresponds
+     * to an arbitrary code. To see which ringtone code this is on your device, run
+     * adb shell settings get system ringtone
+     * The number you see at the end of the file path is the one you need.
+     * To see alarms and notifications ringtone codes, run the following:
+     * adb shell settings get system alarm_alert
+     * adb shell settings get system notification_sound
+     * @param r Ringtone setting - the name of the ringtone as displayed on device
+     * @param settingName - the code of the ringtone as explained above
+     * @param dir - the direction in which to scroll
+     */
+    private void verifyRingtone(RingtoneSetting r, String settingName) throws Exception {
+        findRingtoneInList(r.getName()).click();
+        if (mDevice.getProductName().equals("walleye") || mDevice.getProductName().equals("taimen")) {
+            mDevice.wait(Until.findObject(By.text("SAVE")), TIMEOUT).click();
+        }
+        else {
+            mDevice.wait(Until.findObject(By.text("OK")), TIMEOUT).click();
+        }
+        SystemClock.sleep(1000);
+        if (r.getVal().equals("null")) {
+            assertEquals(null,
+                    Settings.System.getString(mResolver, settingName));
+        } else if (r.getName().contains("Hangouts")) {
+            assertEquals("content://media/external/audio/media/" + r.getVal(),
+                    Settings.System.getString(mResolver, settingName));
+        } else {
+            assertEquals("content://media/internal/audio/media/" + r.getVal(),
+                    Settings.System.getString(mResolver, settingName));
+        }
+    }
+
+    private enum ScrollDir {
+        UP,
+        DOWN,
+        NOSCROLL
+    }
+
+    class RingtoneSetting {
+        private final String mName;
+        private final String mMediaVal;
+        public RingtoneSetting(String name, String fname) {
+            mName = name;
+            mMediaVal = fname;
+        }
+        public String getName() {
+            return mName;
+        }
+        public String getVal() {
+            return mMediaVal;
+        }
+    }
+
+    private void clickMore() throws InterruptedException {
+        UiObject2 more = mDevice.wait(Until.findObject(By.text("Advanced")), TIMEOUT);
+        if (more != null) {
+            more.click();
+            Thread.sleep(TIMEOUT);
+        }
+    }
+
+    private UiObject2 findRingtoneInList(String ringtone) throws Exception {
+        mHelper.scrollVert(false);
+        SystemClock.sleep(1000);
+        UiObject2 ringToneObject = mDevice.wait(Until.findObject(By.text(ringtone)), TIMEOUT);
+        int count = 0;
+        while (ringToneObject == null && count < 5) {
+            mHelper.scrollVert(true);
+            SystemClock.sleep(1000);
+            ringToneObject = mDevice.wait(Until.findObject(By.text(ringtone)), TIMEOUT);
+            count++;
+        }
+        return ringToneObject;
+    }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/SyncSettingsTest.java b/tests/uitests/src/com/android/settings/ui/SyncSettingsTest.java
new file mode 100644
index 0000000..3dca424
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/SyncSettingsTest.java
@@ -0,0 +1,70 @@
+/*
+ * 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.ui;
+
+import android.os.RemoteException;
+import android.provider.Settings;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+import android.system.helpers.SettingsHelper;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static junit.framework.Assert.assertTrue;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class SyncSettingsTest {
+    private static final int TIMEOUT = 2000;
+
+    private UiDevice mDevice;
+
+    @Before
+    public void setUp() throws Exception {
+        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+
+        try {
+            mDevice.setOrientationNatural();
+        } catch (RemoteException e) {
+            throw new RuntimeException("failed to freeze device orientaion", e);
+        }
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        // Need to finish settings activity
+        mDevice.pressHome();
+    }
+
+    @Test
+    public void syncPageShouldHaveAddAccountButton() throws Exception {
+        // Launch Settings
+        SettingsHelper.launchSettingsPage(
+                InstrumentationRegistry.getContext(), Settings.ACTION_SYNC_SETTINGS);
+        UiObject2 addAccount = mDevice.wait(
+                Until.findObject(By.text("Add account")), TIMEOUT);
+        assertTrue(addAccount != null);
+    }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/WirelessNetworkSettingsTests.java b/tests/uitests/src/com/android/settings/ui/WirelessNetworkSettingsTests.java
new file mode 100644
index 0000000..1e3b978
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/WirelessNetworkSettingsTests.java
@@ -0,0 +1,777 @@
+/*
+ * 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.ui;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.wifi.WifiManager;
+import android.os.RemoteException;
+import android.platform.test.annotations.Presubmit;
+import android.provider.Settings;
+import android.system.helpers.CommandsHelper;
+import android.system.helpers.SettingsHelper;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.BySelector;
+import android.support.test.uiautomator.Direction;
+import android.support.test.uiautomator.StaleObjectException;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.test.suitebuilder.annotation.Suppress;
+import android.util.Log;
+import junit.framework.AssertionFailedError;
+
+public class WirelessNetworkSettingsTests extends InstrumentationTestCase {
+    // These back button presses are performed in tearDown() to exit Wifi
+    // Settings sub-menus that a test might finish in. This number should be
+    // high enough to account for the deepest sub-menu a test might enter.
+    private static final int NUM_BACK_BUTTON_PRESSES = 5;
+    private static final int TIMEOUT = 2000;
+    private static final int SLEEP_TIME = 500;
+    private static final String AIRPLANE_MODE_BROADCAST =
+            "am broadcast -a android.intent.action.AIRPLANE_MODE";
+    private static final String TAG="WirelessNetworkSettingsTests";
+
+    // Note: The values of these variables might affect flakiness in tests that involve
+    // scrolling. Adjust where necessary.
+    private static final float SCROLL_UP_PERCENT = 10.0f;
+    private static final float SCROLL_DOWN_PERCENT = 0.5f;
+    private static final int MAX_SCROLL_ATTEMPTS = 10;
+    private static final int MAX_ADD_NETWORK_BUTTON_ATTEMPTS = 3;
+    private static final int SCROLL_SPEED = 2000;
+
+    private static final String TEST_SSID = "testSsid";
+    private static final String TEST_PW_GE_8_CHAR = "testPasswordGreaterThan8Char";
+    private static final String TEST_PW_LT_8_CHAR = "lt8Char";
+    private static final String TEST_DOMAIN = "testDomain.com";
+
+    private static final String SETTINGS_PACKAGE = "com.android.settings";
+
+    private static final String CHECKBOX_CLASS = "android.widget.CheckBox";
+    private static final String SPINNER_CLASS = "android.widget.Spinner";
+    private static final String EDIT_TEXT_CLASS = "android.widget.EditText";
+    private static final String SCROLLVIEW_CLASS = "android.widget.ScrollView";
+    private static final String LISTVIEW_CLASS = "android.widget.ListView";
+
+    private static final String ADD_NETWORK_MENU_CANCEL_BUTTON_TEXT = "CANCEL";
+    private static final String ADD_NETWORK_MENU_SAVE_BUTTON_TEXT = "SAVE";
+    private static final String ADD_NETWORK_PREFERENCE_TEXT = "Add network";
+    private static final String CONFIGURE_WIFI_PREFERENCE_TEXT = "Wi‑Fi preferences";
+    private static final String CONFIGURE_WIFI_ADVANCED_PREFERENCE_TEXT = "Advanced";
+    private static final String CACERT_MENU_PLEASE_SELECT_TEXT = "Please select";
+    private static final String CACERT_MENU_USE_SYSTEM_CERTS_TEXT = "Use system certificates";
+    private static final String CACERT_MENU_DO_NOT_VALIDATE_TEXT = "Do not validate";
+    private static final String USERCERT_MENU_PLEASE_SELECT_TEXT = "Please select";
+    private static final String USERCERT_MENU_DO_NOT_PROVIDE_TEXT = "Do not provide";
+    private static final String SECURITY_OPTION_NONE_TEXT = "None";
+    private static final String SECURITY_OPTION_WEP_TEXT = "WEP";
+    private static final String SECURITY_OPTION_PSK_TEXT = "WPA/WPA2 PSK";
+    private static final String SECURITY_OPTION_EAP_TEXT = "802.1x EAP";
+    private static final String EAP_METHOD_PEAP_TEXT = "PEAP";
+    private static final String EAP_METHOD_TLS_TEXT = "TLS";
+    private static final String EAP_METHOD_TTLS_TEXT = "TTLS";
+    private static final String EAP_METHOD_PWD_TEXT = "PWD";
+    private static final String EAP_METHOD_SIM_TEXT = "SIM";
+    private static final String EAP_METHOD_AKA_TEXT = "AKA";
+    private static final String EAP_METHOD_AKA_PRIME_TEXT = "AKA'";
+    private static final String PHASE2_MENU_NONE_TEXT = "None";
+    private static final String PHASE2_MENU_MSCHAPV2_TEXT = "MSCHAPV2";
+    private static final String PHASE2_MENU_GTC_TEXT = "GTC";
+
+    private static final String ADD_NETWORK_MENU_ADV_TOGGLE_RES_ID = "wifi_advanced_togglebox";
+    private static final String ADD_NETWORK_MENU_IP_SETTINGS_RES_ID = "ip_settings";
+    private static final String ADD_NETWORK_MENU_PROXY_SETTINGS_RES_ID = "proxy_settings";
+    private static final String ADD_NETWORK_MENU_SECURITY_OPTION_RES_ID = "security";
+    private static final String ADD_NETWORK_MENU_EAP_METHOD_RES_ID = "method";
+    private static final String ADD_NETWORK_MENU_SSID_RES_ID = "ssid";
+    private static final String ADD_NETWORK_MENU_PHASE2_RES_ID = "phase2";
+    private static final String ADD_NETWORK_MENU_CACERT_RES_ID = "ca_cert";
+    private static final String ADD_NETWORK_MENU_USERCERT_RES_ID = "user_cert";
+    private static final String ADD_NETWORK_MENU_NO_DOMAIN_WARNING_RES_ID = "no_domain_warning";
+    private static final String ADD_NETWORK_MENU_NO_CACERT_WARNING_RES_ID = "no_ca_cert_warning";
+    private static final String ADD_NETWORK_MENU_DOMAIN_LAYOUT_RES_ID = "l_domain";
+    private static final String ADD_NETWORK_MENU_DOMAIN_RES_ID = "domain";
+    private static final String ADD_NETWORK_MENU_IDENTITY_LAYOUT_RES_ID = "l_identity";
+    private static final String ADD_NETWORK_MENU_ANONYMOUS_LAYOUT_RES_ID = "l_anonymous";
+    private static final String ADD_NETWORK_MENU_PASSWORD_LAYOUT_RES_ID = "password_layout";
+    private static final String ADD_NETWORK_MENU_SHOW_PASSWORD_LAYOUT_RES_ID =
+            "show_password_layout";
+    private static final String ADD_NETWORK_MENU_PASSWORD_RES_ID = "password";
+
+    private static final BySelector ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR =
+            By.scrollable(true).clazz(SCROLLVIEW_CLASS);
+    private static final BySelector SPINNER_OPTIONS_SCROLLABLE_BY_SELECTOR =
+            By.scrollable(true).clazz(LISTVIEW_CLASS);
+
+    private UiDevice mDevice;
+    private CommandsHelper mCommandsHelper;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        mDevice = UiDevice.getInstance(getInstrumentation());
+        try {
+            mDevice.setOrientationNatural();
+        } catch (RemoteException e) {
+            throw new RuntimeException("failed to freeze device orientation", e);
+        }
+        // Ensure airplane mode is OFF so that wifi can be enabled using WiFiManager.
+        Settings.Global.putString(getInstrumentation().getContext().getContentResolver(),
+                Settings.Global.AIRPLANE_MODE_ON, "0");
+        Log.d(TAG, "sending airplane mode broadcast to device");
+        mCommandsHelper = CommandsHelper.getInstance();
+        mCommandsHelper.executeShellCommand(AIRPLANE_MODE_BROADCAST);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        // Exit all settings sub-menus.
+        for (int i = 0; i < NUM_BACK_BUTTON_PRESSES; ++i) {
+            mDevice.pressBack();
+        }
+        mDevice.pressHome();
+        super.tearDown();
+    }
+
+    @Presubmit
+    @MediumTest
+    public void testWiFiEnabled() throws Exception {
+        verifyWiFiOnOrOff(true);
+    }
+
+    @Presubmit
+    @MediumTest
+    public void testWiFiDisabled() throws Exception {
+        verifyWiFiOnOrOff(false);
+    }
+
+    @MediumTest
+    public void testWifiMenuLoadConfigure() throws Exception {
+        loadWiFiConfigureMenu();
+        Thread.sleep(SLEEP_TIME);
+        UiObject2 configureWiFiHeading = mDevice.wait(Until.findObject
+                (By.text(CONFIGURE_WIFI_PREFERENCE_TEXT)), TIMEOUT);
+        assertNotNull("Configure WiFi menu has not loaded correctly", configureWiFiHeading);
+    }
+
+    @MediumTest
+    public void testNetworkNotificationsOn() throws Exception {
+        verifyNetworkNotificationsOnOrOff(true);
+    }
+
+    @MediumTest
+    public void testNetworkNotificationsOff() throws Exception {
+        verifyNetworkNotificationsOnOrOff(false);
+    }
+
+    @MediumTest
+    public void testAddNetworkMenu_Default() throws Exception {
+        loadAddNetworkMenu();
+
+        // Submit button should be disabled by default, while cancel button should be enabled.
+        assertFalse(mDevice.wait(Until.findObject(
+                By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+        assertTrue(mDevice.wait(Until.findObject(
+                By.text(ADD_NETWORK_MENU_CANCEL_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+        // Check that the SSID field is defaults to the hint.
+        assertEquals("Enter the SSID", mDevice.wait(Until.findObject(By
+                .res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_SSID_RES_ID)
+                .clazz(EDIT_TEXT_CLASS)), TIMEOUT*2)
+                .getText());
+
+        // Check Security defaults to None.
+        assertEquals("None", mDevice.wait(Until.findObject(By
+                .res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_SECURITY_OPTION_RES_ID)
+                .clazz(SPINNER_CLASS)), TIMEOUT)
+                .getChildren().get(0).getText());
+
+        // Check advanced options are collapsed by default.
+        assertFalse(mDevice.wait(Until.findObject(By
+                .res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_ADV_TOGGLE_RES_ID)
+                .clazz(CHECKBOX_CLASS)), TIMEOUT).isChecked());
+
+    }
+
+    @Suppress
+    @MediumTest
+    public void testAddNetworkMenu_Proxy() throws Exception {
+        loadAddNetworkMenu();
+
+        // Toggle advanced options.
+        mDevice.wait(Until.findObject(By
+                .res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_ADV_TOGGLE_RES_ID)
+                .clazz(CHECKBOX_CLASS)), TIMEOUT).click();
+
+        // Verify Proxy defaults to None.
+        BySelector proxySettingsBySelector =
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_PROXY_SETTINGS_RES_ID)
+                .clazz(SPINNER_CLASS);
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR, proxySettingsBySelector);
+        assertEquals("None", mDevice.wait(Until.findObject(proxySettingsBySelector), TIMEOUT)
+                .getChildren().get(0).getText());
+
+        // Verify that Proxy Manual fields appear.
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR, proxySettingsBySelector);
+        mDevice.wait(Until.findObject(proxySettingsBySelector), TIMEOUT).click();
+        mDevice.wait(Until.findObject(By.text("Manual")), TIMEOUT).click();
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, "proxy_warning_limited_support"));
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, "proxy_hostname"));
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, "proxy_exclusionlist"));
+
+        // Verify that Proxy Auto-Config options appear.
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR, proxySettingsBySelector);
+        mDevice.wait(Until.findObject(proxySettingsBySelector), TIMEOUT).click();
+        mDevice.wait(Until.findObject(By.text("Proxy Auto-Config")), TIMEOUT).click();
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, "proxy_pac"));
+    }
+
+    @Suppress
+    @MediumTest
+    public void testAddNetworkMenu_IpSettings() throws Exception {
+        loadAddNetworkMenu();
+
+        // Toggle advanced options.
+        mDevice.wait(Until.findObject(By
+                .res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_ADV_TOGGLE_RES_ID)
+                .clazz(CHECKBOX_CLASS)), TIMEOUT).click();
+
+        // Verify IP settings defaults to DHCP.
+        BySelector ipSettingsBySelector =
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_IP_SETTINGS_RES_ID).clazz(SPINNER_CLASS);
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR, ipSettingsBySelector);
+        assertEquals("DHCP", mDevice.wait(Until.findObject(ipSettingsBySelector), TIMEOUT)
+                .getChildren().get(0).getText());
+
+        // Verify that Static IP settings options appear.
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR, ipSettingsBySelector).click();
+        mDevice.wait(Until.findObject(By.text("Static")), TIMEOUT).click();
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, "ipaddress"));
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, "gateway"));
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, "network_prefix_length"));
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, "dns1"));
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, "dns2"));
+    }
+
+    @Suppress
+    @MediumTest
+    public void testPhase2Settings() throws Exception {
+        loadAddNetworkMenu();
+        selectSecurityOption(SECURITY_OPTION_EAP_TEXT);
+
+        BySelector phase2SettingsBySelector =
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_PHASE2_RES_ID).clazz(SPINNER_CLASS);
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR, phase2SettingsBySelector);
+        assertEquals(PHASE2_MENU_NONE_TEXT, mDevice.wait(Until
+                .findObject(phase2SettingsBySelector), TIMEOUT).getChildren().get(0).getText());
+        mDevice.wait(Until.findObject(phase2SettingsBySelector), TIMEOUT).click();
+        Thread.sleep(SLEEP_TIME);
+
+        // Verify Phase 2 authentication spinner options.
+        assertNotNull(mDevice.wait(Until.findObject(By.text(PHASE2_MENU_NONE_TEXT)), TIMEOUT));
+        assertNotNull(mDevice.wait(Until.findObject(By.text(PHASE2_MENU_MSCHAPV2_TEXT)), TIMEOUT));
+        assertNotNull(mDevice.wait(Until.findObject(By.text(PHASE2_MENU_GTC_TEXT)), TIMEOUT));
+    }
+
+    @Suppress
+    @MediumTest
+    public void testCaCertSettings() throws Exception {
+        loadAddNetworkMenu();
+        selectSecurityOption(SECURITY_OPTION_EAP_TEXT);
+
+        BySelector caCertSettingsBySelector =
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_CACERT_RES_ID).clazz(SPINNER_CLASS);
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR, caCertSettingsBySelector);
+        assertEquals(CACERT_MENU_PLEASE_SELECT_TEXT, mDevice.wait(Until
+                .findObject(caCertSettingsBySelector), TIMEOUT).getChildren().get(0).getText());
+        mDevice.wait(Until.findObject(caCertSettingsBySelector), TIMEOUT).click();
+        Thread.sleep(SLEEP_TIME);
+
+        // Verify CA certificate spinner options.
+        assertNotNull(mDevice.wait(Until.findObject(
+                By.text(CACERT_MENU_PLEASE_SELECT_TEXT)), TIMEOUT));
+        assertNotNull(mDevice.wait(Until.findObject(
+                By.text(CACERT_MENU_USE_SYSTEM_CERTS_TEXT)), TIMEOUT));
+        assertNotNull(mDevice.wait(Until.findObject(
+                By.text(CACERT_MENU_DO_NOT_VALIDATE_TEXT)), TIMEOUT));
+
+        // Verify that a domain field and warning appear when the user selects the
+        // "Use system certificates" option.
+        mDevice.wait(Until.findObject(By.text(CACERT_MENU_USE_SYSTEM_CERTS_TEXT)), TIMEOUT).click();
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_DOMAIN_LAYOUT_RES_ID));
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_NO_DOMAIN_WARNING_RES_ID));
+
+        // Verify that a warning appears when the user chooses the "Do Not Validate" option.
+        mDevice.wait(Until.findObject(caCertSettingsBySelector), TIMEOUT).click();
+        mDevice.wait(Until.findObject(By.text(CACERT_MENU_DO_NOT_VALIDATE_TEXT)), TIMEOUT).click();
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_NO_CACERT_WARNING_RES_ID));
+    }
+
+    @Suppress
+    @MediumTest
+    public void testAddNetwork_NoSecurity() throws Exception {
+        loadAddNetworkMenu();
+        selectSecurityOption(SECURITY_OPTION_NONE_TEXT);
+
+        // Entering an SSID is enough to enable the submit button. // TODO THIS GUY
+        enterSSID(TEST_SSID);
+        assertTrue(mDevice.wait(Until
+                .findObject(By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+    }
+
+    @Suppress
+    @MediumTest
+    public void testAddNetwork_WEP() throws Exception {
+        loadAddNetworkMenu();
+        selectSecurityOption(SECURITY_OPTION_WEP_TEXT);
+        assertFalse(mDevice.wait(Until.findObject(
+                By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+        // Verify that WEP fields appear.
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_PASSWORD_LAYOUT_RES_ID));
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_SHOW_PASSWORD_LAYOUT_RES_ID));
+
+        // Entering an SSID alone does not enable the submit button.
+        enterSSID(TEST_SSID);
+        assertFalse(mDevice.wait(Until.findObject(
+                By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+        // Submit button is only enabled after a password is entered.
+        enterPassword(TEST_PW_GE_8_CHAR);
+        assertTrue(mDevice.wait(Until
+                .findObject(By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+    }
+
+    @Suppress
+    @MediumTest
+    public void testAddNetwork_PSK() throws Exception {
+        loadAddNetworkMenu();
+        selectSecurityOption(SECURITY_OPTION_PSK_TEXT);
+        assertFalse(mDevice.wait(Until.findObject(
+                By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+        // Verify that PSK fields appear.
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_PASSWORD_LAYOUT_RES_ID));
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_SHOW_PASSWORD_LAYOUT_RES_ID));
+
+        // Entering an SSID alone does not enable the submit button.
+        enterSSID(TEST_SSID);
+        assertFalse(mDevice.wait(Until.findObject(
+                By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+        // Entering an password that is too short does not enable submit button.
+        enterPassword(TEST_PW_LT_8_CHAR);
+        assertFalse(mDevice.wait(Until.findObject(
+                By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+        // Submit button is only enabled after a password of valid length is entered.
+        enterPassword(TEST_PW_GE_8_CHAR);
+        assertTrue(mDevice.wait(Until.findObject(
+                By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+    }
+
+    @Suppress
+    @MediumTest
+    public void testAddNetwork_EAP_PEAP() throws Exception {
+        loadAddNetworkMenu();
+        selectSecurityOption(SECURITY_OPTION_EAP_TEXT);
+        assertFalse(mDevice.wait(Until.findObject(
+                By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+        selectEAPMethod(EAP_METHOD_PEAP_TEXT);
+
+        // Verify that EAP-PEAP fields appear.
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_PHASE2_RES_ID));
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_CACERT_RES_ID));
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_IDENTITY_LAYOUT_RES_ID));
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_ANONYMOUS_LAYOUT_RES_ID));
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_PASSWORD_LAYOUT_RES_ID));
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_SHOW_PASSWORD_LAYOUT_RES_ID));
+
+        // Entering an SSID alone does not enable the submit button.
+        enterSSID(TEST_SSID);
+        assertFalse(mDevice.wait(Until.findObject(
+                By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+        verifyCaCertificateSubmitConditions();
+    }
+
+    @Suppress
+    @MediumTest
+    public void testAddNetwork_EAP_TLS() throws Exception {
+        loadAddNetworkMenu();
+        selectSecurityOption(SECURITY_OPTION_EAP_TEXT);
+        assertFalse(mDevice.wait(Until.findObject(
+                By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+        selectEAPMethod(EAP_METHOD_TLS_TEXT);
+
+        // Verify that EAP-TLS fields appear.
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_CACERT_RES_ID));
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_USERCERT_RES_ID));
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_IDENTITY_LAYOUT_RES_ID));
+
+        // Entering an SSID alone does not enable the submit button.
+        enterSSID(TEST_SSID);
+        assertFalse(mDevice.wait(Until.findObject(
+                By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+        // Selecting the User certificate "Do not provide" option alone does not enable the submit
+        // button.
+        selectUserCertificateOption(USERCERT_MENU_DO_NOT_PROVIDE_TEXT);
+        assertFalse(mDevice.wait(Until.findObject(
+                By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+        verifyCaCertificateSubmitConditions();
+    }
+
+    @Suppress
+    @MediumTest
+    public void testAddNetwork_EAP_TTLS() throws Exception {
+        loadAddNetworkMenu();
+        selectSecurityOption(SECURITY_OPTION_EAP_TEXT);
+        assertFalse(mDevice.wait(Until.findObject(
+                By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+        selectEAPMethod(EAP_METHOD_TTLS_TEXT);
+
+        // Verify that EAP-TLS fields appear.
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_PHASE2_RES_ID));
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_CACERT_RES_ID));
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_IDENTITY_LAYOUT_RES_ID));
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_ANONYMOUS_LAYOUT_RES_ID));
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_PASSWORD_LAYOUT_RES_ID));
+
+        // Entering an SSID alone does not enable the submit button.
+        enterSSID(TEST_SSID);
+        assertFalse(mDevice.wait(Until.findObject(
+                By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+        verifyCaCertificateSubmitConditions();
+    }
+
+    @Suppress
+    @MediumTest
+    public void testAddNetwork_EAP_PWD() throws Exception {
+        loadAddNetworkMenu();
+        selectSecurityOption(SECURITY_OPTION_EAP_TEXT);
+        assertFalse(mDevice.wait(Until.findObject(
+                By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+        selectEAPMethod(EAP_METHOD_PWD_TEXT);
+
+        // Verify that EAP-TLS fields appear.
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_IDENTITY_LAYOUT_RES_ID));
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_PASSWORD_LAYOUT_RES_ID));
+
+        // Entering an SSID alone enables the submit button.
+        enterSSID(TEST_SSID);
+        assertTrue(mDevice.wait(Until.findObject(
+                By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+    }
+
+    @Suppress
+    @MediumTest
+    public void testAddNetwork_EAP_SIM() throws Exception {
+        loadAddNetworkMenu();
+        selectSecurityOption(SECURITY_OPTION_EAP_TEXT);
+        assertFalse(mDevice.wait(Until.findObject(
+                By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+        selectEAPMethod(EAP_METHOD_SIM_TEXT);
+
+        // Entering an SSID alone enables the submit button.
+        enterSSID(TEST_SSID);
+        assertTrue(mDevice.wait(Until.findObject(
+                By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+    }
+
+    @Suppress
+    @MediumTest
+    public void testAddNetwork_EAP_AKA() throws Exception {
+        loadAddNetworkMenu();
+        selectSecurityOption(SECURITY_OPTION_EAP_TEXT);
+        assertFalse(mDevice.wait(Until.findObject(
+                By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+        selectEAPMethod(EAP_METHOD_AKA_TEXT);
+
+        // Entering an SSID alone enables the submit button.
+        enterSSID(TEST_SSID);
+        assertTrue(mDevice.wait(Until.findObject(
+                By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+    }
+
+    @Suppress
+    @MediumTest
+    public void testAddNetwork_EAP_AKA_PRIME() throws Exception {
+        loadAddNetworkMenu();
+        selectSecurityOption(SECURITY_OPTION_EAP_TEXT);
+        assertFalse(mDevice.wait(Until.findObject(
+                By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+        selectEAPMethod(EAP_METHOD_AKA_PRIME_TEXT);
+
+        // Entering an SSID alone enables the submit button.
+        enterSSID(TEST_SSID);
+        assertTrue(mDevice.wait(Until.findObject(
+                By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+    }
+
+    private void verifyKeepWiFiOnDuringSleep(String settingToBeVerified, int settingValue)
+            throws Exception {
+        loadWiFiConfigureMenu();
+        mDevice.wait(Until.findObject(By.text("Keep Wi‑Fi on during sleep")), TIMEOUT)
+                .click();
+        mDevice.wait(Until.findObject(By.clazz("android.widget.CheckedTextView")
+                .text(settingToBeVerified)), TIMEOUT).click();
+        Thread.sleep(SLEEP_TIME);
+        int keepWiFiOnSetting =
+                Settings.Global.getInt(getInstrumentation().getContext().getContentResolver(),
+                Settings.Global.WIFI_SLEEP_POLICY);
+        assertEquals(settingValue, keepWiFiOnSetting);
+    }
+
+    private void verifyNetworkNotificationsOnOrOff(boolean verifyOn)
+            throws Exception {
+        // Enable network recommendations to enable the toggle switch for Network
+        // notifications
+        Settings.Global.putString(getInstrumentation().getContext().getContentResolver(),
+                Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED, "1");
+        if (verifyOn) {
+            Settings.Global.putString(getInstrumentation().getContext().getContentResolver(),
+                    Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, "0");
+        }
+        else {
+            Settings.Global.putString(getInstrumentation().getContext().getContentResolver(),
+                    Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, "1");
+        }
+        loadWiFiConfigureMenu();
+        mDevice.wait(Until.findObject(By.text("Open network notification")), TIMEOUT)
+                .click();
+        Thread.sleep(SLEEP_TIME);
+        String wifiNotificationValue =
+                Settings.Global.getString(getInstrumentation().getContext().getContentResolver(),
+                Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON);
+        if (verifyOn) {
+            assertEquals("1", wifiNotificationValue);
+        }
+        else {
+            assertEquals("0", wifiNotificationValue);
+        }
+    }
+
+    private void verifyWiFiOnOrOff(boolean verifyOn) throws Exception {
+         String switchText = "On";
+         if (verifyOn) {
+             switchText = "Off";
+         }
+         loadWiFiSettingsPage(!verifyOn);
+         mDevice.wait(Until
+                 .findObject(By.res(SETTINGS_PACKAGE, "switch_bar").text(switchText)), TIMEOUT)
+                 .click();
+         Thread.sleep(SLEEP_TIME);
+         String wifiValue =
+                 Settings.Global.getString(getInstrumentation().getContext().getContentResolver(),
+                 Settings.Global.WIFI_ON);
+         if (verifyOn) {
+             // 1 is Enabled, 2 is Enabled while airplane mode is ON.
+             assertTrue(wifiValue.equals("1") || wifiValue.equals("2"));
+         }
+         else {
+             assertEquals("0", wifiValue);
+         }
+    }
+
+    private void verifyCaCertificateSubmitConditions() throws Exception {
+        // Selecting the CA certificate "Do not validate" option enables the submit button.
+        selectCaCertificateOption(CACERT_MENU_DO_NOT_VALIDATE_TEXT);
+        assertTrue(mDevice.wait(Until.findObject(
+                By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+        // However, selecting the CA certificate "Use system certificates option" is not enough to
+        // enable the submit button.
+        selectCaCertificateOption(CACERT_MENU_USE_SYSTEM_CERTS_TEXT);
+        assertFalse(mDevice.wait(Until.findObject(
+                By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+
+        // Submit button is only enabled after a domain is entered as well.
+        enterDomain(TEST_DOMAIN);
+        assertTrue(mDevice.wait(Until.findObject(
+                By.text(ADD_NETWORK_MENU_SAVE_BUTTON_TEXT)), TIMEOUT).isEnabled());
+    }
+
+    private void loadWiFiSettingsPage(boolean wifiEnabled) throws Exception {
+        WifiManager wifiManager = (WifiManager)getInstrumentation().getContext()
+                .getSystemService(Context.WIFI_SERVICE);
+        wifiManager.setWifiEnabled(wifiEnabled);
+        SettingsHelper.launchSettingsPage(getInstrumentation().getContext(),
+                Settings.ACTION_WIFI_SETTINGS);
+    }
+
+    private void loadWiFiConfigureMenu() throws Exception {
+        loadWiFiSettingsPage(false);
+        Thread.sleep(TIMEOUT);
+        mDevice.wait(Until.findObject(By.text(CONFIGURE_WIFI_PREFERENCE_TEXT)), TIMEOUT).click();
+        mDevice.wait(Until.findObject(
+                By.text(CONFIGURE_WIFI_ADVANCED_PREFERENCE_TEXT)), TIMEOUT).click();
+    }
+
+    private void loadAddNetworkMenu() throws Exception {
+        loadWiFiSettingsPage(true);
+        for (int attempts = 0; attempts < MAX_ADD_NETWORK_BUTTON_ATTEMPTS; ++attempts) {
+            try {
+                findOrScrollToObject(By.scrollable(true), By.text(ADD_NETWORK_PREFERENCE_TEXT))
+                        .click();
+            } catch (StaleObjectException e) {
+                // The network list might have been updated between when the Add network button was
+                // found, and when it UI automator attempted to click on it. Retry.
+                continue;
+            }
+            // If we get here, we successfully clicked on the Add network button, so we are done.
+            Thread.sleep(SLEEP_TIME*5);
+            return;
+        }
+
+        fail("Failed to load Add Network Menu after " + MAX_ADD_NETWORK_BUTTON_ATTEMPTS
+                + " retries");
+    }
+
+    private void selectSecurityOption(String securityOption) throws Exception {
+        // We might not need to scroll to the security options if not enough add network menu
+        // options are visible.
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_SECURITY_OPTION_RES_ID)
+                .clazz(SPINNER_CLASS)).click();
+        Thread.sleep(SLEEP_TIME);
+        mDevice.wait(Until.findObject(By.text(securityOption)), TIMEOUT).click();
+    }
+
+    private void selectEAPMethod(String eapMethod) throws Exception {
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_EAP_METHOD_RES_ID).clazz(SPINNER_CLASS))
+                .click();
+        Thread.sleep(SLEEP_TIME);
+        findOrScrollToObject(SPINNER_OPTIONS_SCROLLABLE_BY_SELECTOR, By.text(eapMethod)).click();
+    }
+
+    private void selectUserCertificateOption(String userCertificateOption) throws Exception {
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_USERCERT_RES_ID).clazz(SPINNER_CLASS))
+                .click();
+        mDevice.wait(Until.findObject(By.text(userCertificateOption)), TIMEOUT).click();
+    }
+
+    private void selectCaCertificateOption(String caCertificateOption) throws Exception {
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_CACERT_RES_ID).clazz(SPINNER_CLASS))
+                .click();
+        mDevice.wait(Until.findObject(By.text(caCertificateOption)), TIMEOUT).click();
+    }
+
+    private void enterSSID(String ssid) throws Exception {
+        // We might not need to scroll to the SSID option if not enough add network menu options
+        // are visible.
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_SSID_RES_ID).clazz(EDIT_TEXT_CLASS))
+                .setText(ssid);
+    }
+
+    private void enterPassword(String password) throws Exception {
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_PASSWORD_RES_ID).clazz(EDIT_TEXT_CLASS))
+                .setText(password);
+    }
+
+    private void enterDomain(String domain) throws Exception {
+        findOrScrollToObject(ADD_NETWORK_MENU_SCROLLABLE_BY_SELECTOR,
+                By.res(SETTINGS_PACKAGE, ADD_NETWORK_MENU_DOMAIN_RES_ID)).setText(domain);
+    }
+
+    // Use this if the UI object might or might not need to be scrolled to.
+    private UiObject2 findOrScrollToObject(BySelector scrollableSelector, BySelector objectSelector)
+            throws Exception {
+        UiObject2 object = mDevice.wait(Until.findObject(objectSelector), TIMEOUT);
+        if (object == null) {
+            object = scrollToObject(scrollableSelector, objectSelector);
+        }
+        return object;
+    }
+
+    private UiObject2 scrollToObject(BySelector scrollableSelector, BySelector objectSelector)
+            throws Exception {
+        UiObject2 scrollable = mDevice.wait(Until.findObject(scrollableSelector), TIMEOUT);
+        if (scrollable == null) {
+            fail("Could not find scrollable UI object identified by " + scrollableSelector);
+        }
+        UiObject2 found = null;
+        // Scroll all the way up first, then all the way down.
+        while (true) {
+            // Optimization: terminate if we find the object while scrolling up to reset, so
+            // we save the time spent scrolling down again.
+            boolean canScrollAgain = scrollable.scroll(Direction.UP, SCROLL_UP_PERCENT,
+                    SCROLL_SPEED);
+            found = mDevice.findObject(objectSelector);
+            if (found != null) return found;
+            if (!canScrollAgain) break;
+        }
+        for (int attempts = 0; found == null && attempts < MAX_SCROLL_ATTEMPTS; ++attempts) {
+            // Return value of UiObject2.scroll() is not reliable, so do not use it in loop
+            // condition, in case it causes this loop to terminate prematurely.
+            scrollable.scroll(Direction.DOWN, SCROLL_DOWN_PERCENT, SCROLL_SPEED);
+            found = mDevice.findObject(objectSelector);
+        }
+        if (found == null) {
+            fail("Could not scroll to UI object identified by " + objectSelector);
+        }
+        return found;
+    }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/testutils/SettingsTestUtils.java b/tests/uitests/src/com/android/settings/ui/testutils/SettingsTestUtils.java
new file mode 100644
index 0000000..9b1be14
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/testutils/SettingsTestUtils.java
@@ -0,0 +1,61 @@
+/*
+ * 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.ui.testutils;
+
+import static org.junit.Assert.assertNotNull;
+
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.Direction;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+
+public class SettingsTestUtils {
+
+    public static final String SETTINGS_PACKAGE = "com.android.settings";
+    public static final int TIMEOUT = 2000;
+
+    private void scrollToTop(UiDevice device) throws Exception {
+        int count = 5;
+        UiObject2 view = null;
+        while (count >= 0) {
+            view = device.wait(
+                    Until.findObject(By.res(SETTINGS_PACKAGE, "main_content")),
+                    TIMEOUT);
+            view.scroll(Direction.UP, 1.0f);
+            count--;
+        }
+    }
+
+    public static void assertTitleMatch(UiDevice device, String title) {
+        int maxAttempt = 5;
+        UiObject2 item = null;
+        UiObject2 view = null;
+        while (maxAttempt-- > 0) {
+            item = device.wait(Until.findObject(By.res("android:id/title").text(title)), TIMEOUT);
+            if (item == null) {
+                view = device.wait(
+                        Until.findObject(By.res(SETTINGS_PACKAGE, "main_content")),
+                        TIMEOUT);
+                view.scroll(Direction.DOWN, 1.0f);
+            } else {
+                return;
+            }
+        }
+        assertNotNull(String.format("%s in Setting has not been loaded correctly", title), item);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/search/SearchActivityTest.java b/tests/unit/src/com/android/settings/search/SearchActivityTest.java
deleted file mode 100644
index 8a7e3fe..0000000
--- a/tests/unit/src/com/android/settings/search/SearchActivityTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.search;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
-import com.android.settings.Settings;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-
-@SmallTest
-@RunWith(AndroidJUnit4.class)
-public class SearchActivityTest {
-
-    @Test
-    public void shouldHaveParentActivity() {
-        final Context context = InstrumentationRegistry.getTargetContext();
-        final PackageManager packageManager = context.getPackageManager();
-        final Intent intent = new Intent(context, SearchActivity.class);
-        final List<ResolveInfo> resolveInfos = packageManager.queryIntentActivities(
-                intent, PackageManager.GET_META_DATA);
-
-        assertThat(resolveInfos).isNotEmpty();
-        assertThat(resolveInfos.get(0).activityInfo.parentActivityName)
-                .isEqualTo(Settings.class.getName());
-    }
-}
diff --git a/tests/unit/src/com/android/settings/search/SearchFragmentEspressoTest.java b/tests/unit/src/com/android/settings/search/SearchFragmentEspressoTest.java
deleted file mode 100644
index e89dc9e..0000000
--- a/tests/unit/src/com/android/settings/search/SearchFragmentEspressoTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.search;
-
-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.hasFocus;
-import static android.support.test.espresso.matcher.ViewMatchers.withClassName;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.core.AllOf.allOf;
-
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-import android.widget.SearchView;
-
-import com.android.settings.R;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class SearchFragmentEspressoTest {
-    @Rule
-    public ActivityTestRule<SearchActivity> mActivityRule =
-            new ActivityTestRule<>(SearchActivity.class, true, true);
-
-    @Test
-    public void test_OpenKeyboardOnSearchLaunch() {
-        onView(allOf(hasFocus(), withId(R.id.search_view)))
-                .check(matches(withClassName(containsString(SearchView.class.getName()))));
-    }
-}